@addev-be/ui 0.6.24 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addev-be/ui",
-  "version": "0.6.24",
+  "version": "0.7.0",
   "type": "module",
   "scripts": {
     "watch": "tsc -b --watch",

package/src/components/data/SqlRequestDataGrid/helpers/columns.tsx

@@ -248,15 +248,18 @@ export const sqlCheckboxColumn = <R extends Record<string, any>>(
 ): SqlRequestDataGridColumns<R> => ({
   [key]: {
     name: title,
-    render: (row) => (
-      <>
-        <input type="checkbox" checked={row[key]} readOnly />
-        <span>{row[key] ? ' Oui' : ' Non'}</span>
-      </>
-    ),
+    render: (row) => {
+      const value = !!+(row[key] ?? 0);
+      return (
+        <>
+          <input type="checkbox" checked={value} readOnly />
+          <span>{value ? ' Oui' : ' Non'}</span>
+        </>
+      );
+    },
     getter: (row) => row[key] ?? '',
     sortGetter: (row) => row[key] ?? '',
-    filter: { ...numberFilter(key), getter: (value) => value[key] ?? 0 },
+    filter: { ...numberFilter(key), getter: (value) => +(value[key] ?? 0) },
     footer: (rows) => `${rows[0][key]} éléments`,
     ...options,
   },

package/src/components/data/SqlRequestDataGrid/index.tsx

@@ -85,11 +85,14 @@ export const SqlRequestDataGridInner = <R,>(
     setCount(-1);
   }, []);
 
-  const onFiltersChanged = useCallback((filters: DataGridFilters) => {
-    const newConditions = convertSqlFiltersToConditions(filters);
-    setCount(-1);
-    setConditions(newConditions);
-  }, []);
+  const onFiltersChanged = useCallback(
+    (filters: DataGridFilters) => {
+      const newConditions = convertSqlFiltersToConditions(filters);
+      setConditions(newConditions);
+      refresh();
+    },
+    [refresh]
+  );
 
   const onSortsChanged = useCallback(
     (sorts: Record<string, DataGridSort>) => {

package/src/providers/AuthenticationProvider/helpers.ts

@@ -0,0 +1,3 @@
+export const basePermissions: Record<string, string> = {
+  'users.manage': 'Gérer les utilisateurs',
+};

package/src/providers/AuthenticationProvider/index.tsx

@@ -18,6 +18,8 @@ import {
   useSendRecoveryKeyRequestHandler,
 } from '../../services';
 
+import { basePermissions } from './helpers';
+
 export type AuthenticationContextProps = {
   token?: string;
   user?: UserDTO;
@@ -28,6 +30,8 @@ export type AuthenticationContextProps = {
   sendRecoveryKey: (email: string) => Promise<number>;
   checkRecoveryKey: (key: string) => Promise<number>;
   resetPassword: (key: string, password: string) => Promise<number>;
+  permissions: Record<string, string>;
+  hasPermission: (permission: string) => boolean;
 };
 
 export const AuthenticationContext = createContext<AuthenticationContextProps>({
@@ -38,18 +42,26 @@ export const AuthenticationContext = createContext<AuthenticationContextProps>({
   sendRecoveryKey: async () => -1,
   checkRecoveryKey: async () => -1,
   resetPassword: async () => -1,
+  permissions: {},
+  hasPermission: () => false,
 });
 
 export type AuthenticationProviderProps = PropsWithChildren<{
+  permissions?: Record<string, string>;
   loginComponent?: FC;
   requestHandlerName?: string;
 }>;
 
 export const AuthenticationProvider: FC<AuthenticationProviderProps> = ({
+  permissions,
   loginComponent: LoginComponent,
   children,
   requestHandlerName,
 }) => {
+  const allPermissions = useMemo(
+    () => ({ ...basePermissions, ...permissions }),
+    [permissions]
+  );
   const [, setWebSocketStatus] = useState<boolean | undefined>(false);
   const [token, setToken] = useState<string | undefined>(
     sessionStorage.getItem('authToken') || undefined
@@ -148,6 +160,14 @@ export const AuthenticationProvider: FC<AuthenticationProviderProps> = ({
     [sendCheckRecoveryKeyRequest]
   );
 
+  const hasPermission = useCallback(
+    (permission: string) =>
+      permission in allPermissions &&
+      !!allPermissions[permission] &&
+      (user?.isAdmin || (user?.permissions?.includes(permission) ?? false)),
+    [allPermissions, user?.isAdmin, user?.permissions]
+  );
+
   const contextValue = useMemo(
     () => ({
       token,
@@ -159,10 +179,14 @@ export const AuthenticationProvider: FC<AuthenticationProviderProps> = ({
       sendRecoveryKey,
       checkRecoveryKey,
       resetPassword,
+      permissions: allPermissions,
+      hasPermission,
     }),
     [
+      allPermissions,
       authenticate,
       checkRecoveryKey,
+      hasPermission,
       login,
       logout,
       resetPassword,

package/src/services/base.ts

@@ -1,15 +1,7 @@
-export type BaseModelDTO = {
-  id: string;
-  dateAdd: string;
-  dateUpd: string;
-  dateDel: string | null;
-};
+import { BaseModelDTO } from './types/base';
 
 export const emptyBaseModel: BaseModelDTO = {
   id: '',
-  dateAdd: new Date().toISOString(),
-  dateUpd: new Date().toISOString(),
-  dateDel: null,
 };
 
 export type ArchivableModelDTO = BaseModelDTO & {

package/src/services/index.ts

@@ -11,4 +11,3 @@ export * from './types/auth';
 export * from './types/base';
 export * from './types/users';
 export * from './types/userProfiles';
-export * from './types/userPermissions';

package/src/services/types/userProfiles.ts

@@ -63,7 +63,7 @@ export type GetAllUserProfilesResponseDTO = t.TypeOf<
 
 export const saveUserProfileRequestDtoCodec = t.type(
   {
-    userProfile: userProfileDtoCodec,
+    data: userProfileDtoCodec,
   },
   'SaveUserProfileRequestDTO'
 );

package/src/services/types/users.ts

@@ -62,7 +62,13 @@ export type GetAllUsersResponseDTO = t.TypeOf<
 
 export const saveUserRequestDtoCodec = t.type(
   {
-    user: userDtoCodec,
+    data: t.intersection([
+      userDtoCodec,
+      t.partial({
+        password: t.string,
+      }),
+    ]),
+    password: t.string,
   },
   'SaveUserRequestDTO'
 );

package/src/services/types/userPermissions.ts

@@ -1,3 +0,0 @@
-export const userPermissions: Record<string, string> = {
-  'users:manage': 'Gérer les utilisateurs',
-};