Merge branch 'develop' into update/OH2-399-group-permissions-select-rows

informatici · Oct 29, 2024 · f26bde8 · f26bde8
2 parents f4ae4ab + f15d23c
commit f26bde8
Show file tree

Hide file tree

Showing 18 changed files with 2,477 additions and 2,353 deletions.
diff --git a/api/oh.yaml b/api/oh.yaml
diff --git a/src/components/accessories/admin/users/Users.tsx b/src/components/accessories/admin/users/Users.tsx
@@ -1,12 +1,14 @@
 import { Tab, Tabs } from "@mui/material";
-import React from "react";
+import React, { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useNavigate } from "react-router";
 
 import Button from "../../button/Button";
 import UserGroupsTable from "./userGroupsTable";
 import UsersTable from "./usersTable";
 
+import { useAppDispatch } from "libraries/hooks/redux";
+import { deleteUser } from "state/users";
 import { PATHS } from "../../../../consts";
 import { UserDTO, UserGroupDTO } from "../../../../generated";
 
@@ -18,6 +20,7 @@ export enum TabOptions {
 export const Users = () => {
   const navigate = useNavigate();
   const { t } = useTranslation();
+  const dispatch = useAppDispatch();
 
   const { state }: { state: { tab?: TabOptions } } = useLocation();
   const setTab = (tab: TabOptions) =>
@@ -33,6 +36,13 @@ export const Users = () => {
       state: row,
     });
 
+  const handleDeleteUser = useCallback(
+    (row: UserDTO) => {
+      dispatch(deleteUser(row.userName ?? ""));
+    },
+    [dispatch]
+  );
+
   return (
     <>
       <Tabs
@@ -58,6 +68,7 @@ export const Users = () => {
             </Button>
           }
           onEdit={handleEditUser}
+          onDelete={handleDeleteUser}
         />
       ) : (
         <UserGroupsTable

diff --git a/src/components/accessories/admin/users/usersTable/UsersTable.tsx b/src/components/accessories/admin/users/usersTable/UsersTable.tsx
@@ -1,35 +1,57 @@
 import { CircularProgress } from "@mui/material";
-import React, { ReactNode, useEffect } from "react";
+import React, { ReactNode, useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
 
 import { useAppDispatch, useAppSelector } from "libraries/hooks/redux";
 import { usePermission } from "libraries/permissionUtils/usePermission";
+import checkIcon from "../../../../../assets/check-icon.png";
 import { UserDTO } from "../../../../../generated";
-import { getUsers } from "../../../../../state/users";
+import { deleteUserReset, getUsers } from "../../../../../state/users";
+import ConfirmationDialog from "../../../confirmationDialog/ConfirmationDialog";
 import InfoBox from "../../../infoBox/InfoBox";
 import Table from "../../../table/Table";
 import { TFilterField } from "../../../table/filter/types";
 
+import { scrollToElement } from "libraries/uiUtils/scrollToElement";
 import { getUserGroups } from "state/usergroups";
 import classes from "./UsersTable.module.scss";
 
 interface IOwnProps {
   headerActions: ReactNode;
   onEdit: (row: UserDTO) => void;
+  onDelete: (row: UserDTO) => void;
 }
 
-export const UsersTable = ({ headerActions, onEdit }: IOwnProps) => {
+export const UsersTable = ({ headerActions, onEdit, onDelete }: IOwnProps) => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation();
+  const infoBoxRef = useRef<HTMLDivElement>(null);
+
   const canUpdate = usePermission("users.update");
+  const canDelete = usePermission("users.update");
+
+  const deleteUser = useAppSelector((state) => state.users.delete);
 
   useEffect(() => {
     dispatch(getUsers({}));
     dispatch(getUserGroups());
+
+    return () => {
+      dispatch(deleteUserReset());
+    };
   }, [dispatch]);
 
-  const header = ["userName", "userGroupName", "desc"];
+  useEffect(() => {
+    if (deleteUser.status === "FAIL") {
+      scrollToElement(infoBoxRef.current);
+    }
+
+    if (deleteUser.hasSucceeded) {
+      dispatch(getUsers({}));
+    }
+  }, [deleteUser.status, dispatch]);
 
+  const header = ["userName", "userGroupName", "desc"];
   const label = {
     userName: t("user.username"),
     userGroupName: t("user.groups"),
@@ -65,7 +87,7 @@ export const UsersTable = ({ headerActions, onEdit }: IOwnProps) => {
         userGroupName:
           item.userGroupName?.desc ?? item.userGroupName?.code ?? "",
         desc: item.desc ?? "",
-        passwd: item.passwd ?? ""
+        passwd: item.passwd ?? "",
       };
     });
   };
@@ -85,23 +107,42 @@ export const UsersTable = ({ headerActions, onEdit }: IOwnProps) => {
 
           case "SUCCESS":
             return (
-              <Table
-                rowData={formatDataToDisplay(data ?? [])}
-                tableHeader={header}
-                labelData={label}
-                columnsOrder={order}
-                rowsPerPage={10}
-                filterColumns={filters}
-                manualFilter={false}
-                isCollapsabile={false}
-                rawData={(data ?? []).map((user) => ({
-                  ...user,
-                  userGroupName: user.userGroupName?.code,
-                }))}
-                rowKey="userName"
-                headerActions={headerActions}
-                onEdit={canUpdate ? onEdit: undefined}
-              />
+              <>
+                {deleteUser.status === "FAIL" && (
+                  <div ref={infoBoxRef} className="info-box-container">
+                    <InfoBox type="error" message={deleteUser.error?.message} />
+                  </div>
+                )}
+                <Table
+                  rowData={formatDataToDisplay(data ?? [])}
+                  tableHeader={header}
+                  labelData={label}
+                  columnsOrder={order}
+                  rowsPerPage={10}
+                  filterColumns={filters}
+                  manualFilter={false}
+                  isCollapsabile={false}
+                  rawData={(data ?? []).map((user) => ({
+                    ...user,
+                    userGroupName: user.userGroupName?.code,
+                  }))}
+                  rowKey="userName"
+                  headerActions={headerActions}
+                  onEdit={canUpdate ? onEdit : undefined}
+                  onDelete={canDelete ? onDelete : undefined}
+                />
+                <ConfirmationDialog
+                  isOpen={!!deleteUser.hasSucceeded}
+                  title={t("user.deleted")}
+                  icon={checkIcon}
+                  info={t("user.deleteSuccess")}
+                  primaryButtonLabel="Ok"
+                  handlePrimaryButtonClick={() => {
+                    dispatch(deleteUserReset());
+                  }}
+                  handleSecondaryButtonClick={() => ({})}
+                />
+              </>
             );
           case "SUCCESS_EMPTY":
             return <InfoBox type="info" message={t("common.emptydata")} />;

diff --git a/src/generated/.openapi-generator/FILES b/src/generated/.openapi-generator/FILES
@@ -47,7 +47,6 @@ index.ts
 models\AdmissionDTO.ts
 models\AdmissionTypeDTO.ts
 models\AdmittedPatientDTO.ts
-models\AgeType.ts
 models\AgeTypeDTO.ts
 models\BillDTO.ts
 models\BillItemsDTO.ts

diff --git a/src/generated/apis/AgeTypesApi.ts b/src/generated/apis/AgeTypesApi.ts
@@ -14,7 +14,6 @@
 import { Observable } from 'rxjs';
 import { BaseAPI, HttpHeaders, HttpQuery, throwIfNullOrUndefined, encodeURI, OperationOpts, RawAjaxResponse } from '../runtime';
 import {
-    AgeType,
     AgeTypeDTO,
 } from '../models';
 
@@ -37,16 +36,16 @@ export class AgeTypesApi extends BaseAPI {
 
     /**
      */
-    getAgeTypeByIndex({ index }: GetAgeTypeByIndexRequest): Observable<AgeType>
-    getAgeTypeByIndex({ index }: GetAgeTypeByIndexRequest, opts?: OperationOpts): Observable<RawAjaxResponse<AgeType>>
-    getAgeTypeByIndex({ index }: GetAgeTypeByIndexRequest, opts?: OperationOpts): Observable<AgeType | RawAjaxResponse<AgeType>> {
+    getAgeTypeByIndex({ index }: GetAgeTypeByIndexRequest): Observable<AgeTypeDTO>
+    getAgeTypeByIndex({ index }: GetAgeTypeByIndexRequest, opts?: OperationOpts): Observable<RawAjaxResponse<AgeTypeDTO>>
+    getAgeTypeByIndex({ index }: GetAgeTypeByIndexRequest, opts?: OperationOpts): Observable<AgeTypeDTO | RawAjaxResponse<AgeTypeDTO>> {
         throwIfNullOrUndefined(index, 'index', 'getAgeTypeByIndex');
 
         const headers: HttpHeaders = {
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
         };
 
-        return this.request<AgeType>({
+        return this.request<AgeTypeDTO>({
             url: '/agetypes/{index}'.replace('{index}', encodeURI(index)),
             method: 'GET',
             headers,

diff --git a/src/generated/models/AgeTypeDTO.ts b/src/generated/models/AgeTypeDTO.ts
@@ -35,6 +35,12 @@ export interface AgeTypeDTO {
      * @memberof AgeTypeDTO
      */
     from: number;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof AgeTypeDTO
+     */
+    lock?: number;
     /**
      * The maximum value of the range
      * @type {number}

diff --git a/src/generated/models/BillDTO.ts b/src/generated/models/BillDTO.ts
@@ -90,6 +90,12 @@ export interface BillDTO {
      * @memberof BillDTO
      */
     user: string;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof BillDTO
+     */
+    lock?: number;
     /**
      * @type {boolean}
      * @memberof BillDTO

diff --git a/src/generated/models/PatientExaminationDTO.ts b/src/generated/models/PatientExaminationDTO.ts
@@ -118,6 +118,12 @@ export interface PatientExaminationDTO {
      * @memberof PatientExaminationDTO
      */
     pex_bowel_desc?: PatientExaminationDTOPexBowelDescEnum;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof PatientExaminationDTO
+     */
+    lock?: number;
 }
 
 /**

diff --git a/src/generated/models/PriceDTO.ts b/src/generated/models/PriceDTO.ts
@@ -55,6 +55,12 @@ export interface PriceDTO {
      * @memberof PriceDTO
      */
     price: number;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof PriceDTO
+     */
+    lock?: number;
     /**
      * @type {boolean}
      * @memberof PriceDTO

diff --git a/src/generated/models/PriceListDTO.ts b/src/generated/models/PriceListDTO.ts
@@ -46,6 +46,12 @@ export interface PriceListDTO {
      * @memberof PriceListDTO
      */
     currency?: string;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof PriceListDTO
+     */
+    lock?: number;
     /**
      * @type {number}
      * @memberof PriceListDTO

diff --git a/src/generated/models/PricesOthersDTO.ts b/src/generated/models/PricesOthersDTO.ts
@@ -34,6 +34,12 @@ export interface PricesOthersDTO {
      * @memberof PricesOthersDTO
      */
     description: string;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof PricesOthersDTO
+     */
+    lock?: number;
     /**
      * @type {boolean}
      * @memberof PricesOthersDTO

diff --git a/src/generated/models/SupplierDTO.ts b/src/generated/models/SupplierDTO.ts
@@ -63,4 +63,10 @@ export interface SupplierDTO {
      * @memberof SupplierDTO
      */
     supNote?: string;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof SupplierDTO
+     */
+    lock?: number;
 }
diff --git a/src/generated/models/UserSettingDTO.ts b/src/generated/models/UserSettingDTO.ts
@@ -40,4 +40,10 @@ export interface UserSettingDTO {
      * @memberof UserSettingDTO
      */
     configValue: string;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof UserSettingDTO
+     */
+    lock?: number;
 }
diff --git a/src/generated/models/VisitDTO.ts b/src/generated/models/VisitDTO.ts
@@ -68,4 +68,10 @@ export interface VisitDTO {
      * @memberof VisitDTO
      */
     service?: string;
+    /**
+     * Lock
+     * @type {number}
+     * @memberof VisitDTO
+     */
+    lock?: number;
 }
diff --git a/src/generated/models/index.ts b/src/generated/models/index.ts
@@ -1,7 +1,6 @@
 export * from './AdmissionDTO';
 export * from './AdmissionTypeDTO';
 export * from './AdmittedPatientDTO';
-export * from './AgeType';
 export * from './AgeTypeDTO';
 export * from './BillDTO';
 export * from './BillItemsDTO';

diff --git a/src/mockServer/routes/users.js b/src/mockServer/routes/users.js
@@ -29,6 +29,16 @@ export const userRoutes = (server) => {
     server.put("/:username").intercept((_req, res) => {
       res.status(200).json(_req.jsonBody());
     });
+    server.delete("/:username").intercept((req, res) => {
+      const username = req.params.username;
+      switch (username) {
+        case "FAIL":
+          res.status(400).json({ message: "Fail to delete user" });
+          break;
+        default:
+          res.status(204);
+      }
+    });
     server.get("/:username/settings/dashboard").intercept((req, res) => {
       res.status(200).json(dashboardSettingDTO);
     });

diff --git a/src/mockServer/routes/wards.js b/src/mockServer/routes/wards.js
@@ -40,10 +40,10 @@ export const wardsRoutes = (server) => {
       const code = req.params.code;
       switch (code) {
         case "FAIL":
-          res.status(400).json({ message: "Fail to update ward" });
+          res.status(400).json({ message: "Fail to delete ward" });
           break;
         default:
-          res.status(200);
+          res.status(204);
       }
     });
   });

diff --git a/src/resources/i18n/en.json b/src/resources/i18n/en.json
@@ -30,6 +30,7 @@
     "editGroup": "Edit group",
     "description": "Description",
     "lastlogin": "Last login",
+    "deleted": "User deleted",
     "groupCreated": "Group created",
     "groupDeleted": "Group deleted",
     "groupUpdated": "Group updated",
@@ -41,6 +42,7 @@
     "createdSuccessTitle": "User created",
     "createdSuccessMessage": "User has been created successfully!",
     "updatedSuccessTitle": "User updated",
+    "deleteSuccess": "User has been deleted successfully!",
     "updatedSuccessMessage": "User has been updated successfully!",
     "validateUserNeedsGroup": "Each user should belong to a group",
     "validatePasswordNeeded": "No password provided.",