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.

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

U4X-289 : Deleting stock sources #47

Merged
merged 1 commit into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const StockSourcesAddOrUpdate: React.FC<AddStockSourceProps> = ({ model }) => {
// get stock sources
const { items } = useConceptById(STOCK_SOURCE_TYPE_CODED_CONCEPT_ID);

const [formModel, setFormModel] = useState<StockSource>();
const [formModel, setFormModel] = useState<StockSource>({ ...model });

const onNameChanged = (evt: React.ChangeEvent<HTMLInputElement>): void => {
model ? (model.name = evt.target.value) : "";
Expand Down Expand Up @@ -78,7 +78,7 @@ const StockSourcesAddOrUpdate: React.FC<AddStockSourceProps> = ({ model }) => {
)
.catch();
},
[formModel, t]
[formModel, model, t]
);
return (
<div>
Expand Down
47 changes: 25 additions & 22 deletions src/stock-sources/edit-stock-source/edit-stock-source.component.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,35 @@
import { Button, Tooltip } from "@carbon/react";
import React, { useCallback } from "react";
import { Button } from "@carbon/react";
import { Edit } from "@carbon/react/icons";
import { interpolateUrl, navigate } from "@openmrs/esm-framework";

import React, { AnchorHTMLAttributes } from "react";
import { useTranslation } from "react-i18next";
import { launchOverlay } from "../../core/components/overlay/hook";
import StockSourcesAddOrUpdate from "../add-stock-sources/add-stock-sources.component";
import { StockSource } from "../../core/api/types/stockOperation/StockSource";

interface NameLinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
to: string;
from: string;
interface EditStockSourcesActionMenuProps {
data?: StockSource;
}

const EditSourceActionsMenu: React.FC<NameLinkProps> = ({ from, to }) => {
const EditStockSourceActionsMenu: React.FC<EditStockSourcesActionMenuProps> = ({
data,
}) => {
const { t } = useTranslation();
const handleNameClick = (event: MouseEvent, to: string) => {
event.preventDefault();
navigate({ to });
localStorage.setItem("fromPage", from);
};
const handleClick = useCallback(() => {
launchOverlay(
"Edit Stock Source",
<StockSourcesAddOrUpdate model={data} />
);
}, [data]);

return (
<Tooltip align="bottom" label="Edit Patient">
<Button
kind="ghost"
onClick={(e) => handleNameClick(e, to)}
href={interpolateUrl(to)}
iconDescription={t("editSource", "Edit Source")}
renderIcon={(props) => <Edit size={16} {...props} />}
></Button>
</Tooltip>
<Button
kind="ghost"
size="md"
onClick={() => handleClick()}
iconDescription={t("editStockItem", "Edit Stock Item")}
renderIcon={(props) => <Edit size={16} {...props} />}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
iconDescription={t("editStockItem", "Edit Stock Item")}
iconDescription={t("editStockSource", "Edit Stock Source")}

/>
);
};
export default EditSourceActionsMenu;
export default EditStockSourceActionsMenu;
Original file line number Diff line number Diff line change
@@ -1,20 +1,64 @@
import React from "react";
import { Button, Form, ModalFooter, ModalHeader } from "@carbon/react";
import React, { useState } from "react";
import { Button, InlineLoading } from "@carbon/react";
import { useTranslation } from "react-i18next";
import { TrashCan } from "@carbon/react/icons";
import { deleteStockSource } from "../stock-sources.resource";
import { showNotification, showToast } from "@openmrs/esm-framework";

const StockSourcesDelete: React.FC = () => {
return (
<div>
<Form>
<ModalHeader />
<ModalFooter>
<Button kind="secondary">Cancel</Button>
<Button kind="danger" type="submit">
Delete
</Button>
</ModalFooter>
</Form>
</div>
interface StockSourcesDeleteActionMenuProps {
uuid: string;
}

const StockSourcesDeleteActionMenu: React.FC<
StockSourcesDeleteActionMenuProps
> = ({ uuid }) => {
const { t } = useTranslation();

const [deletingSource, setDeletingSource] = useState(false);

const handleClick = (e) => {
e.preventDefault();
setDeletingSource(true);
const ids = [];
ids.push(uuid);
deleteStockSource(ids)
.then(
() => {
setDeletingSource(false);
showToast({
critical: true,
title: t("deletingSource", "Delete Source"),
kind: "success",
description: t(
"stocksourcedeletedsuccessfully",
"Stock Source Deleted Successfully"
),
});
},
(error) => {
setDeletingSource(false);
showNotification({
title: t(`errorDeletingSource', 'error deleting a source`),
kind: "error",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
title: t(`errorDeletingSource', 'error deleting a source`),
title: t(`errorDeletingSource', 'Error deleting a stock source`),

critical: true,
description: error?.message,
});
}
)
.catch();
};

const deleteButton = (
<Button
kind="ghost"
size="md"
onClick={handleClick}
iconDescription={t("deleteSource", "Delete Source")}
renderIcon={(props) => <TrashCan size={16} {...props} />}
/>
);

return deletingSource ? <InlineLoading /> : deleteButton;
};

export default StockSourcesDelete;
export default StockSourcesDeleteActionMenu;
38 changes: 9 additions & 29 deletions src/stock-sources/stock-sources-items-table.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,16 @@ import {
TableToolbarMenu,
DataTableSkeleton,
TableToolbarSearch,
Button,
Tooltip,
} from "@carbon/react";
import { isDesktop } from "@openmrs/esm-framework";
import { Edit } from "@carbon/react/icons";
import useStockSourcesPage from "./stock-sources-items-table.resource";
import { ResourceRepresentation } from "../core/api/api";
import AddStockSourceActionButton from "./add-stock-source-button.component";
import StockSourcesFilter from "./stock-sources-filter/stock-sources-filter.component";
import styles from "./stock-sources.scss";
import { useTranslation } from "react-i18next";
import { launchOverlay } from "../core/components/overlay/hook";
import StockSourcesAddOrUpdate from "./add-stock-sources/add-stock-sources.component";
import StockSourcesDeleteActionMenu from "./stock-sources-delete/stock-sources-delete.component";
import EditStockSourceActionsMenu from "./edit-stock-source/edit-stock-source.component";

function StockSourcesItems() {
const { t } = useTranslation();
Expand All @@ -49,31 +46,8 @@ function StockSourcesItems() {
totalCount: true,
});

const handleClick = useCallback((data: any) => {
launchOverlay(
"Edit Stock Source",
<StockSourcesAddOrUpdate model={data} />
);
}, []);

if (items) {
items.forEach((row) => {
row["actions"] = (
<Tooltip align="bottom" label="Edit Stock Item">
<Button
kind="ghost"
size="md"
onClick={() => handleClick(row)}
iconDescription={t("editStockItem", "Edit Stock Item")}
renderIcon={(props) => <Edit size={16} {...props} />}
></Button>
</Tooltip>
);
});
}

const tableRows = useMemo(() => {
return items?.map((entry) => {
return items?.map((entry, index) => {
return {
...entry,
id: entry?.uuid,
Expand All @@ -82,6 +56,12 @@ function StockSourcesItems() {
name: entry?.name,
acronym: entry?.acronym,
sourceType: entry?.sourceType?.display,
actions: (
<>
<EditStockSourceActionsMenu data={items[index]} />
<StockSourcesDeleteActionMenu uuid={items[index].uuid} />
</>
),
};
});
}, [items]);
Expand Down
Loading