Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Administration: make main components overridable #125

Closed
wants to merge 1 commit into from
Closed

Administration: make main components overridable #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion invenio_administration/assets/semantic-ui/js/invenio_administration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
"luxon": "^1.23.0",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-scripts": "^5.0.1"
"react-scripts": "^5.0.1",
"react-overridable": "^0.0.3",
"semantic-ui-react": "^2.1.3",
"i18next": "^21.10.0"
},
"jest": {
"snapshotSerializers": [
Expand Down
175 changes: 91 additions & 84 deletions invenio_administration/assets/semantic-ui/js/invenio_administration/src/actions/Actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
// This file is part of InvenioAdministration
// Copyright (C) 2022 CERN.
//
// Invenio RDM Records is free software; you can redistribute it and/or modify it
// under the terms of the MIT License; see LICENSE file for more details.

import React, { Component } from "react";
import PropTypes from "prop-types";
import isEmpty from "lodash/isEmpty";
import { ResourceActions } from "./ResourceActions";
import { ActionsDropdown } from "./ActionsDropdown";
import { ResourceActions, ActionsDropdown, DeleteModalTrigger } from ".";
import { Button, Icon, Popup } from "semantic-ui-react";
import { AdminUIRoutes } from "../routes";
import { DeleteModalTrigger } from "./DeleteModalTrigger";
import { i18next } from "@translations/invenio_administration/i18next";
import Overridable from "react-overridable";

export class Actions extends Component {
class Actions extends Component {
render() {
const {
title,
Expand All @@ -35,86 +40,86 @@ export class Actions extends Component {
const displayAsDropdown =
displayEdit && displayDelete && Object.keys(actions).length > 1;

if (displayAsDropdown) {
return (
<ActionsDropdown
title={title}
resourceName={resourceName}
apiEndpoint={apiEndpoint}
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
actions={actions}
displayEdit={displayEdit}
displayDelete={displayDelete}
/>
);
} else {
return (
<Button.Group size="tiny" className="relaxed">
{!isEmpty(actions) && (
<ResourceActions
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
actions={actions}
apiEndpoint={apiEndpoint}
/>
)}
{displayEdit && (
<Popup
content={
disabledEditMessage
? disabledEditMessage
: i18next.t("Resource is not editable.")
}
disabled={!disableEdit}
trigger={
<span className="mr-5">
<Button
as="a"
disabled={disableEdit}
href={AdminUIRoutes.editView(listUIEndpoint, resource, idKeyPath)}
icon
labelPosition="left"
title={disabledEditMessage ? disabledEditMessage : ""}
>
<Icon name="pencil" />
{i18next.t("Edit")}
</Button>
</span>
}
/>
)}
{displayDelete && (
<Popup
content={
disabledDeleteMessage
? disabledDeleteMessage
: i18next.t("Resource is not deletable.")
}
disabled={!disableDelete}
trigger={
<span>
<DeleteModalTrigger
title={title}
resourceName={resourceName}
apiEndpoint={apiEndpoint}
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
disabled={disableDelete}
disabledDeleteMessage={
disabledEditMessage ? disabledEditMessage : ""
}
/>
</span>
}
/>
)}
</Button.Group>
);
}
return (
<Overridable id="Actions.layout">
{displayAsDropdown ? (
<ActionsDropdown
title={title}
resourceName={resourceName}
apiEndpoint={apiEndpoint}
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
actions={actions}
displayEdit={displayEdit}
displayDelete={displayDelete}
/>
) : (
<Button.Group size="tiny" className="relaxed">
{!isEmpty(actions) && (
<ResourceActions
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
actions={actions}
apiEndpoint={apiEndpoint}
/>
)}
{displayEdit && (
<Popup
content={
disabledEditMessage
? disabledEditMessage
: i18next.t("Resource is not editable.")
}
disabled={!disableEdit}
trigger={
<span className="mr-5">
<Button
as="a"
disabled={disableEdit}
href={AdminUIRoutes.editView(listUIEndpoint, resource, idKeyPath)}
icon
labelPosition="left"
title={disabledEditMessage ? disabledEditMessage : ""}
>
<Icon name="pencil" />
{i18next.t("Edit")}
</Button>
</span>
}
/>
)}
{displayDelete && (
<Popup
content={
disabledDeleteMessage
? disabledDeleteMessage
: i18next.t("Resource is not deletable.")
}
disabled={!disableDelete}
trigger={
<span>
<DeleteModalTrigger
title={title}
resourceName={resourceName}
apiEndpoint={apiEndpoint}
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
disabled={disableDelete}
disabledDeleteMessage={
disabledEditMessage ? disabledEditMessage : ""
}
/>
</span>
}
/>
)}
</Button.Group>
)}
</Overridable>
);
}
}

Expand Down Expand Up @@ -153,3 +158,5 @@ Actions.defaultProps = {
apiEndpoint: undefined,
idKeyPath: "pid",
};

export default Overridable.component("Actions", Actions);
80 changes: 45 additions & 35 deletions ...dministration/assets/semantic-ui/js/invenio_administration/src/actions/ActionsDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
// This file is part of InvenioAdministration
// Copyright (C) 2022 CERN.
//
// Invenio RDM Records is free software; you can redistribute it and/or modify it
// under the terms of the MIT License; see LICENSE file for more details.

import React, { Component } from "react";
import PropTypes from "prop-types";
import { Dropdown, Button } from "semantic-ui-react";
import { ResourceActions } from "./ResourceActions";
import { ResourceActions, DeleteModalTrigger } from ".";
import isEmpty from "lodash/isEmpty";
import { i18next } from "@translations/invenio_administration/i18next";
import { DeleteModalTrigger } from "./DeleteModalTrigger";
import Overridable from "react-overridable";

export class ActionsDropdown extends Component {
class ActionsDropdown extends Component {
render() {
const {
title,
Expand All @@ -20,38 +26,40 @@ export class ActionsDropdown extends Component {
actions,
} = this.props;
return (
<Dropdown>
{!isEmpty(actions) && (
<ResourceActions
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
actions={actions}
apiEndpoint={apiEndpoint}
Element={Dropdown.Item}
trigger={
<Button
icon="cog"
size="tiny"
className="transparent rel-ml-1"
aria-label={i18next.t("Open list of actions")}
/>
}
/>
)}
{displayEdit && <Dropdown.Item>Edit</Dropdown.Item>}
{displayDelete && (
<DeleteModalTrigger
title={title}
resourceName={resourceName}
apiEndpoint={apiEndpoint}
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
Element={Dropdown.Item}
/>
)}
</Dropdown>
<Overridable id="ActionsDropdown.layout">
<Dropdown>
{!isEmpty(actions) && (
<ResourceActions
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
actions={actions}
apiEndpoint={apiEndpoint}
Element={Dropdown.Item}
trigger={
<Button
icon="cog"
size="tiny"
className="transparent rel-ml-1"
aria-label={i18next.t("Open list of actions")}
/>
}
/>
)}
{displayEdit && <Dropdown.Item>Edit</Dropdown.Item>}
{displayDelete && (
<DeleteModalTrigger
title={title}
resourceName={resourceName}
apiEndpoint={apiEndpoint}
resource={resource}
successCallback={successCallback}
idKeyPath={idKeyPath}
Element={Dropdown.Item}
/>
)}
</Dropdown>
</Overridable>
);
}
}
Expand All @@ -72,3 +80,5 @@ ActionsDropdown.defaultProps = {
displayDelete: true,
displayEdit: true,
};

export default Overridable.component("ActionsDropdown", ActionsDropdown);
59 changes: 0 additions & 59 deletions invenio_administration/assets/semantic-ui/js/invenio_administration/src/actions/Delete.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...io_administration/assets/semantic-ui/js/invenio_administration/src/actions/DeleteModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { NotificationContext } from "../ui_messages/context";
import Overridable from "react-overridable";
import { InvenioAdministrationActionsApi } from "../api/actions";

export class DeleteModal extends Component {
class DeleteModal extends Component {
constructor(props) {
super(props);
this.state = { loading: false, error: undefined };
Expand Down
Loading