gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix snackbar errors

Browse Source
This commit is contained in:
Daniel Lautzenheiser 2022-10-26 11:46:44 -04:00
parent 03815ec2f0
commit e36698aa9a
6 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/actions/auth.ts
View File

@ -86,18 +86,22 @@ export function loginUser(credentials: Credentials) {
.then(user => {
dispatch(authenticate(user));
})
.catch((error: Error) => {
.catch((error: unknown) => {
console.error(error);
dispatch(
addSnackbar({
type: 'warning',
message: {
key: 'ui.toast.onFailToAuth',
message: error.message,
},
}),
);
dispatch(authError(error));
if (error instanceof Error) {
dispatch(
addSnackbar({
type: 'warning',
message: {
key: 'ui.toast.onFailToAuth',
options: {
details: error.message,
},
},
}),
);
dispatch(authError(error));
}
});
};
}

20
core/src/actions/entries.ts
View File

@ -624,7 +624,9 @@ export function loadEntry(collection: Collection, slug: string, silent = false)
type: 'error',
message: {
key: 'ui.toast.onFailToLoadEntries',
details: error.message,
options: {
details: error.message,
},
},
}),
);
@ -744,7 +746,9 @@ export function loadEntries(collection: Collection, page = 0) {
type: 'error',
message: {
key: 'ui.toast.onFailToLoadEntries',
details: error.message,
options: {
details: error.message,
},
},
}),
);
@ -803,7 +807,9 @@ export function traverseCollectionCursor(collection: Collection, action: string)
type: 'error',
message: {
key: 'ui.toast.onFailToLoadEntries',
details: error.message,
options: {
details: error.message,
},
},
}),
);
@ -1071,7 +1077,9 @@ export function persistEntry(collection: Collection) {
type: 'error',
message: {
key: 'ui.toast.onFailToPersist',
details: error,
options: {
details: error,
},
},
}),
);
@ -1102,7 +1110,9 @@ export function deleteEntry(collection: Collection, slug: string) {
type: 'error',
message: {
key: 'ui.toast.onFailToDelete',
details: error,
options: {
details: error,
},
},
}),
);

12
core/src/actions/mediaLibrary.ts
View File

@ -337,7 +337,9 @@ export function persistMedia(file: File, opts: MediaOptions = {}) {
type: 'error',
message: {
key: 'ui.toast.onFailToPersistMedia',
details: error,
options: {
details: error,
},
},
}),
);
@ -381,7 +383,9 @@ export function deleteMedia(file: MediaFile, opts: MediaOptions = {}) {
type: 'error',
message: {
key: 'ui.toast.onFailToDeleteMedia',
details: error.message,
options: {
details: error.message,
},
},
}),
);
@ -417,7 +421,9 @@ export function deleteMedia(file: MediaFile, opts: MediaOptions = {}) {
type: 'error',
message: {
key: 'ui.toast.onFailToDeleteMedia',
details: error.message,
options: {
details: error.message,
},
},
}),
);

5
core/src/actions/status.ts
View File

@ -55,7 +55,10 @@ export function checkBackendStatus() {
dispatch(
addSnackbar({
type: 'error',
message: { key: 'ui.toast.onBackendDown', details: status.api.statusPage },
message: {
key: 'ui.toast.onBackendDown',
options: { details: status.api.statusPage },
},
}),
);
}

2
core/src/backends/azure/AuthenticationPage.tsx
View File

@ -34,7 +34,7 @@ const AzureAuthenticationPage = ({
if (err) {
alert({
title: 'auth.errors.authTitle',
body: { key: 'auth.errors.authBody', options: { details: err } },
body: { key: 'auth.errors.authBody', options: { details: err.toString() } },
});
return;
} else if (data) {

5
core/src/store/slices/snackbars.ts
View File

@ -11,9 +11,10 @@ export interface SnackbarMessage {
type: MessageType;
message:
| string
| ({
| {
key: string;
} & Record<string, unknown>);
options?: Record<string, unknown>;
};
}
// Define a type for the slice state