clean types

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

src/pages/groups/modification/group-modification-dialog.tsx

@@ -15,7 +15,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm } from 'react-hook-form';
 import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react';
 import { CustomMuiDialog, FetchStatus, useSnackMessage } from '@gridsuite/commons-ui';
-import { GroupInfos, UpdateGroupInfos, UserAdminSrv, UserInfos } from '../../../services';
+import { GroupInfos, UserAdminSrv, UserInfos } from '../../../services';
 
 interface GroupModificationDialogProps {
     groupInfos: GroupInfos | undefined;
@@ -86,7 +86,7 @@ const GroupModificationDialog: FunctionComponent<GroupModificationDialogProps> =
     const onSubmit = useCallback(
         (groupFormData: GroupModificationFormType) => {
             if (groupInfos?.id) {
-                const newData: UpdateGroupInfos = {
+                const newData: GroupInfos = {
                     id: groupInfos.id,
                     name: groupFormData.name,
                     users: selectedUsers,

src/pages/profiles/profiles-table.tsx

@@ -16,7 +16,7 @@ import {
     ITooltipParams,
     RowClickedEvent,
     SelectionChangedEvent,
-    TextFilterParams
+    TextFilterParams,
 } from 'ag-grid-community';
 import { useSnackMessage } from '@gridsuite/commons-ui';
 import DeleteConfirmationDialog from '../common/delete-confirmation-dialog';

src/pages/users/modification/user-modification-dialog.tsx

@@ -16,7 +16,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm } from 'react-hook-form';
 import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react';
 import { CustomMuiDialog, FetchStatus, useSnackMessage } from '@gridsuite/commons-ui';
-import { GroupInfos, UpdateUserInfos, UserAdminSrv, UserInfos, UserProfile } from '../../../services';
+import { GroupInfos, UserAdminSrv, UserInfos, UserProfile } from '../../../services';
 
 interface UserModificationDialogProps {
     userInfos: UserInfos | undefined;
@@ -109,13 +109,13 @@ const UserModificationDialog: FunctionComponent<UserModificationDialogProps> = (
     const onSubmit = useCallback(
         (userFormData: UserModificationFormType) => {
             if (userInfos) {
-                const newData: UpdateUserInfos = {
+                const newData: UserInfos = {
                     sub: userInfos.sub, // can't be changed
                     isAdmin: userInfos.isAdmin, // can't be changed
                     profileName: userFormData.profileName ?? undefined,
                     groups: selectedGroups,
                 };
-                UserAdminSrv.udpateUser(newData)
+                UserAdminSrv.updateUser(newData)
                     .catch((error) =>
                         snackError({
                             messageTxt: error.message,

src/services/user-admin.ts

@@ -7,15 +7,11 @@
 
 import { User } from 'oidc-client';
 import { backendFetch, backendFetchJson, getRestBase } from '../utils/api-rest';
-import { extractUserSub, getToken, getUser } from '../utils/api';
+import { extractUserSub, getToken } from '../utils/api';
 import { UUID } from 'crypto';
 
 const USER_ADMIN_URL = `${getRestBase()}/user-admin/v1`;
 
-export function getUserSub(): Promise<unknown> {
-    return extractUserSub(getUser());
-}
-
 /*
  * fetchValidateUser is call from commons-ui AuthServices to validate user infos before setting state.user!
  */
@@ -40,7 +36,7 @@ export function fetchValidateUser(user: User): Promise<boolean> {
 
 export type UserInfos = {
     sub: string;
-    profileName: string;
+    profileName?: string;
     isAdmin: boolean;
     groups: string[];
 };
@@ -59,14 +55,7 @@ export function fetchUsers(): Promise<UserInfos[]> {
     }) as Promise<UserInfos[]>;
 }
 
-export type UpdateUserInfos = {
-    sub: string;
-    profileName?: string;
-    isAdmin?: boolean;
-    groups: string[];
-};
-
-export function udpateUser(userInfos: UpdateUserInfos) {
+export function updateUser(userInfos: UserInfos) {
     console.debug(`Updating a user...`);
 
     return backendFetch(`${USER_ADMIN_URL}/users/${userInfos.sub}`, {
@@ -216,7 +205,7 @@ export function deleteProfiles(names: string[]): Promise<void> {
 }
 
 export type GroupInfos = {
-    id?: UUID;
+    id: UUID;
     name: string;
     users: string[];
 };
@@ -235,13 +224,7 @@ export function fetchGroups(): Promise<GroupInfos[]> {
     }) as Promise<GroupInfos[]>;
 }
 
-export type UpdateGroupInfos = {
-    id: UUID;
-    name: string;
-    users: string[];
-};
-
-export function udpateGroup(groupInfos: UpdateGroupInfos) {
+export function udpateGroup(groupInfos: GroupInfos) {
     console.debug(`Updating a group...`);
 
     return backendFetch(`${USER_ADMIN_URL}/groups/${groupInfos.id}`, {