Skip to content
Open
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
12 changes: 6 additions & 6 deletions src/pages/groups/modification/group-modification-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
const { reset, setValue } = formMethods;
const [userOptions, setUserOptions] = useState<UserSelectionItem[]>([]);
const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
const [dataFetchStatus, setDataFetchStatus] = useState<string>(FetchStatus.IDLE);
const [dataFetchStatus, setDataFetchStatus] = useState<FetchStatus>(FetchStatus.IDLE);

Check failure on line 41 in src/pages/groups/modification/group-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

'FetchStatus' refers to a value, but is being used as a type here. Did you mean 'typeof FetchStatus'?

useEffect(() => {
if (groupInfos && open) {
Expand All @@ -50,10 +50,10 @@
setSelectedUsers(groupInfos.users);

// fetch all users
setDataFetchStatus(FetchStatus.FETCHING);
setDataFetchStatus(FetchStatus.RUNNING);

Check failure on line 53 in src/pages/groups/modification/group-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'RUNNING' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.
UserAdminSrv.fetchUsers()
.then((allUsers: UserInfos[]) => {
setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
setDataFetchStatus(FetchStatus.SUCCEED);

Check failure on line 56 in src/pages/groups/modification/group-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'SUCCEED' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.
setUserOptions(
allUsers
?.map(
Expand All @@ -66,7 +66,7 @@
);
})
.catch((error) => {
setDataFetchStatus(FetchStatus.FETCH_ERROR);
setDataFetchStatus(FetchStatus.FAILED);

Check failure on line 69 in src/pages/groups/modification/group-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'FAILED' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.
snackError({
messageTxt: error.message,
headerId: 'groups.table.error.users',
Expand Down Expand Up @@ -114,8 +114,8 @@
[groupInfos?.id, selectedUsers, snackError, onUpdate]
);

const isDataReady = useMemo(() => dataFetchStatus === FetchStatus.FETCH_SUCCESS, [dataFetchStatus]);
const isDataFetching = useMemo(() => dataFetchStatus === FetchStatus.FETCHING, [dataFetchStatus]);
const isDataReady = useMemo(() => dataFetchStatus === FetchStatus.SUCCEED, [dataFetchStatus]);

Check failure on line 117 in src/pages/groups/modification/group-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'SUCCEED' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.
const isDataFetching = useMemo(() => dataFetchStatus === FetchStatus.RUNNING, [dataFetchStatus]);

Check failure on line 118 in src/pages/groups/modification/group-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'RUNNING' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.

return (
<CustomMuiDialog
Expand Down
12 changes: 6 additions & 6 deletions src/pages/profiles/modification/profile-modification-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
onUpdate,
}) => {
const { snackError } = useSnackMessage();
const [dataFetchStatus, setDataFetchStatus] = useState<string>(FetchStatus.IDLE);
const [dataFetchStatus, setDataFetchStatus] = useState<FetchStatus>(FetchStatus.IDLE);

Check failure on line 44 in src/pages/profiles/modification/profile-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

'FetchStatus' refers to a value, but is being used as a type here. Did you mean 'typeof FetchStatus'?

const formSchema = yup
.object()
Expand Down Expand Up @@ -109,10 +109,10 @@

useEffect(() => {
if (profileId && open) {
setDataFetchStatus(FetchStatus.FETCHING);
setDataFetchStatus(FetchStatus.RUNNING);

Check failure on line 112 in src/pages/profiles/modification/profile-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'RUNNING' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.
UserAdminSrv.getProfile(profileId)
.then((response) => {
setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
setDataFetchStatus(FetchStatus.SUCCEED);

Check failure on line 115 in src/pages/profiles/modification/profile-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'SUCCEED' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.
reset({
[PROFILE_NAME]: response.name,
[LOADFLOW_PARAM_ID]: response.loadFlowParameterId ?? undefined,
Expand All @@ -129,7 +129,7 @@
});
})
.catch((error) => {
setDataFetchStatus(FetchStatus.FETCH_ERROR);
setDataFetchStatus(FetchStatus.FAILED);

Check failure on line 132 in src/pages/profiles/modification/profile-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Property 'FAILED' does not exist on type '{ IDLE: string; FETCHING: string; FETCH_SUCCESS: string; FETCH_ERROR: string; }'.
snackError({
messageTxt: error.message,
headerId: 'profiles.form.modification.readError',
Expand All @@ -138,9 +138,9 @@
}
}, [profileId, open, reset, snackError]);

const isDataReady = useMemo(() => dataFetchStatus === FetchStatus.FETCH_SUCCESS, [dataFetchStatus]);
const isDataReady = useMemo(() => dataFetchStatus === FetchStatus.SUCCEED, [dataFetchStatus]);

const isDataFetching = useMemo(() => dataFetchStatus === FetchStatus.FETCHING, [dataFetchStatus]);
const isDataFetching = useMemo(() => dataFetchStatus === FetchStatus.RUNNING, [dataFetchStatus]);

return (
<CustomMuiDialog
Expand Down
12 changes: 6 additions & 6 deletions src/pages/users/modification/user-modification-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const UserModificationDialog: FunctionComponent<UserModificationDialogProps> = (
const [profileOptions, setProfileOptions] = useState<string[]>([]);
const [groupOptions, setGroupOptions] = useState<GroupSelectionItem[]>([]);
const [selectedGroups, setSelectedGroups] = useState<string[]>([]);
const [dataFetchStatus, setDataFetchStatus] = useState<string>(FetchStatus.IDLE);
const [dataFetchStatus, setDataFetchStatus] = useState<FetchStatus>(FetchStatus.IDLE);

useEffect(() => {
if (userInfos && open) {
Expand All @@ -56,7 +56,7 @@ const UserModificationDialog: FunctionComponent<UserModificationDialogProps> = (
setSelectedGroups(userInfos.groups ?? []);

// fetch profile & groups
setDataFetchStatus(FetchStatus.FETCHING);
setDataFetchStatus(FetchStatus.RUNNING);
const profilePromise = UserAdminSrv.fetchProfilesWithoutValidityCheck();
const groupPromise = UserAdminSrv.fetchGroups();

Expand Down Expand Up @@ -90,10 +90,10 @@ const UserModificationDialog: FunctionComponent<UserModificationDialogProps> = (

Promise.all([profilePromise, groupPromise])
.then(() => {
setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
setDataFetchStatus(FetchStatus.SUCCEED);
})
.catch(() => {
setDataFetchStatus(FetchStatus.FETCH_ERROR);
setDataFetchStatus(FetchStatus.FAILED);
});
}
}, [open, reset, snackError, userInfos]);
Expand Down Expand Up @@ -129,8 +129,8 @@ const UserModificationDialog: FunctionComponent<UserModificationDialogProps> = (
[onUpdate, selectedGroups, snackError, userInfos]
);

const isDataReady = useMemo(() => dataFetchStatus === FetchStatus.FETCH_SUCCESS, [dataFetchStatus]);
const isDataFetching = useMemo(() => dataFetchStatus === FetchStatus.FETCHING, [dataFetchStatus]);
const isDataReady = useMemo(() => dataFetchStatus === FetchStatus.SUCCEED, [dataFetchStatus]);
const isDataFetching = useMemo(() => dataFetchStatus === FetchStatus.RUNNING, [dataFetchStatus]);

return (
<CustomMuiDialog
Expand Down
Loading