Merged in feature/page_actions (pull request #198)

Feature/page actions
This commit is contained in:
Philipp Czora
2019-02-21 10:31:32 +00:00
8 changed files with 147 additions and 14 deletions

View File

@@ -5,7 +5,12 @@ import { translate } from "react-i18next";
import type { Group } from "@scm-manager/ui-types";
import type { PagedCollection } from "@scm-manager/ui-types";
import type { History } from "history";
import { Page, Paginator } from "@scm-manager/ui-components";
import {
Page,
PageActions,
Button,
Paginator
} from "@scm-manager/ui-components";
import { GroupTable } from "./../components/table";
import CreateGroupButton from "../components/buttons/CreateGroupButton";
@@ -73,6 +78,13 @@ class Groups extends React.Component<Props> {
<GroupTable groups={groups} />
{this.renderPaginator()}
{this.renderCreateButton()}
<PageActions>
<Button
label={t("create-group-button.label")}
link="/groups/add"
color="primary"
/>
</PageActions>
</Page>
);
}

View File

@@ -14,7 +14,13 @@ import {
isFetchReposPending
} from "../modules/repos";
import { translate } from "react-i18next";
import { CreateButton, Page, Paginator } from "@scm-manager/ui-components";
import {
Page,
PageActions,
Button,
CreateButton,
Paginator
} from "@scm-manager/ui-components";
import RepositoryList from "../components/list";
import { withRouter } from "react-router-dom";
import type { History } from "history";
@@ -67,6 +73,13 @@ class Overview extends React.Component<Props> {
error={error}
>
{this.renderList()}
<PageActions>
<Button
label={t("overview.createButton")}
link="/repos/create"
color="primary"
/>
</PageActions>
</Page>
);
}
@@ -89,10 +102,7 @@ class Overview extends React.Component<Props> {
const { showCreateButton, t } = this.props;
if (showCreateButton) {
return (
<CreateButton
label={t("overview.createButton")}
link="/repos/create"
/>
<CreateButton label={t("overview.createButton")} link="/repos/create" />
);
}
return null;

View File

@@ -14,7 +14,13 @@ import {
getFetchUsersFailure
} from "../modules/users";
import { Page, CreateButton, Paginator } from "@scm-manager/ui-components";
import {
Page,
PageActions,
Button,
CreateButton,
Paginator
} from "@scm-manager/ui-components";
import { UserTable } from "./../components/table";
import type { User, PagedCollection } from "@scm-manager/ui-types";
import { getUsersLink } from "../../modules/indexResource";
@@ -72,6 +78,13 @@ class Users extends React.Component<Props> {
<UserTable users={users} />
{this.renderPaginator()}
{this.renderCreateButton()}
<PageActions>
<Button
label={t("users.createButton")}
link="/users/add"
color="primary"
/>
</PageActions>
</Page>
);
}