diff --git a/dictation_client/src/features/dictation/dictationSlice.ts b/dictation_client/src/features/dictation/dictationSlice.ts index f90c5ed..fe97dff 100644 --- a/dictation_client/src/features/dictation/dictationSlice.ts +++ b/dictation_client/src/features/dictation/dictationSlice.ts @@ -117,6 +117,10 @@ export const dictationSlice = createSlice({ state.apps.direction = action.payload.direction; state.apps.paramName = action.payload.paramName; }); + // 画面起動時にgetSortColumnAsyncがrejectedするとisLoadingがtrueのままになるため + builder.addCase(getSortColumnAsync.rejected, (state) => { + state.apps.isLoading = false; + }); builder.addCase(listTypistsAsync.fulfilled, (state, action) => { state.domain.typists = action.payload.typists; }); diff --git a/dictation_client/src/features/user/operations.ts b/dictation_client/src/features/user/operations.ts index 225fbfe..bd3d750 100644 --- a/dictation_client/src/features/user/operations.ts +++ b/dictation_client/src/features/user/operations.ts @@ -41,6 +41,13 @@ export const listUsersAsync = createAsyncThunk< // e ⇒ errorObjectに変換 const error = createErrorObject(e); + thunkApi.dispatch( + openSnackbar({ + level: "error", + message: getTranslationID("common.message.internalServerError"), + }) + ); + return thunkApi.rejectWithValue({ error }); } }); diff --git a/dictation_client/src/pages/LicensePage/licenseOrderHistory.tsx b/dictation_client/src/pages/LicensePage/licenseOrderHistory.tsx index aee1606..e20c9f1 100644 --- a/dictation_client/src/pages/LicensePage/licenseOrderHistory.tsx +++ b/dictation_client/src/pages/LicensePage/licenseOrderHistory.tsx @@ -331,6 +331,16 @@ export const LicenseOrderHistory: React.FC = ( ))} + {!isLoading && licenseOrderHistory.length === 0 && ( +

+ {t(getTranslationID("common.message.listEmpty"))} +

+ )} {isLoading && ( { ))} + {!isLoading && childrenPartnerLicensesInfo.length === 0 && ( +

+ {t(getTranslationID("common.message.listEmpty"))} +

+ )} {/* pagenation */}
+ +