diff --git a/src/apps/code-editor/src/store/files.js b/src/apps/code-editor/src/store/files.js index 657357c230..28dbd7cff3 100644 --- a/src/apps/code-editor/src/store/files.js +++ b/src/apps/code-editor/src/store/files.js @@ -299,7 +299,7 @@ export function fetchFiles(type) { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to load files", }) ); }); @@ -502,7 +502,7 @@ export function saveFile(ZUID, status, code = null) { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to save file", }) ); }); @@ -570,7 +570,7 @@ export function publishFile(fileZUID, fileStatus) { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to publish file", }) ); }); diff --git a/src/apps/code-editor/src/store/headers.js b/src/apps/code-editor/src/store/headers.js index edefb8d042..4c33ed4ad3 100644 --- a/src/apps/code-editor/src/store/headers.js +++ b/src/apps/code-editor/src/store/headers.js @@ -71,7 +71,7 @@ export function saveSort(type, headers) { dispatch( notify({ kind: "warn", - message: res.error, + message: res.error || "Failed to save sort order", }) ); } diff --git a/src/apps/content-editor/src/app/views/ItemEdit/Meta/settings/MetaDescription.tsx b/src/apps/content-editor/src/app/views/ItemEdit/Meta/settings/MetaDescription.tsx index 8e9668f751..708b16a8d1 100644 --- a/src/apps/content-editor/src/app/views/ItemEdit/Meta/settings/MetaDescription.tsx +++ b/src/apps/content-editor/src/app/views/ItemEdit/Meta/settings/MetaDescription.tsx @@ -2,7 +2,6 @@ import { useState, useEffect, ChangeEvent } from "react"; import { connect, useDispatch } from "react-redux"; import { TextField, Box } from "@mui/material"; -import { notify } from "../../../../../../../../shell/store/notifications"; import { FieldShell } from "../../../../components/Editor/Field/FieldShell"; import { MaxLengths } from ".."; import { hasErrors } from "./util"; diff --git a/src/apps/content-editor/src/app/views/ItemEdit/components/ItemEditHeader/ItemEditHeaderActions.tsx b/src/apps/content-editor/src/app/views/ItemEdit/components/ItemEditHeader/ItemEditHeaderActions.tsx index b4710ba807..9036d93d28 100644 --- a/src/apps/content-editor/src/app/views/ItemEdit/components/ItemEditHeader/ItemEditHeaderActions.tsx +++ b/src/apps/content-editor/src/app/views/ItemEdit/components/ItemEditHeader/ItemEditHeaderActions.tsx @@ -390,7 +390,9 @@ export const ItemEditHeaderActions = ({ if ("error" in promise.value) { dispatch( notify({ - message: promise.value.error.data?.error, + message: + promise.value.error.data?.error || + "Failed to publish content item.", kind: "error", }) ); diff --git a/src/apps/leads/src/store/leads.js b/src/apps/leads/src/store/leads.js index 8c40af6b0e..174f822122 100644 --- a/src/apps/leads/src/store/leads.js +++ b/src/apps/leads/src/store/leads.js @@ -38,7 +38,7 @@ export function fetchLeads() { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to fetch leads", }) ); return []; @@ -66,7 +66,7 @@ export function deleteLead(leadZuid) { dispatch( notify({ kind: "error", - message: err.message, + message: err.message || "Failed to delete lead", }) ); }); diff --git a/src/apps/schema/src/app/components/SchemaCreateWizard.tsx b/src/apps/schema/src/app/components/SchemaCreateWizard.tsx index 1802386fa1..d8fec39374 100644 --- a/src/apps/schema/src/app/components/SchemaCreateWizard.tsx +++ b/src/apps/schema/src/app/components/SchemaCreateWizard.tsx @@ -74,7 +74,12 @@ export const SchemaCreateWizard = () => { .unwrap() .then((res) => dispatch(fetchModels())) .catch((res) => { - dispatch(notify({ kind: "error", message: res?.data?.message })); + dispatch( + notify({ + kind: "error", + message: res?.data?.message || "Failed to create model", + }) + ); }); }; diff --git a/src/apps/schema/src/store/parents.js b/src/apps/schema/src/store/parents.js index 4d377e4bd5..fcd3b96c59 100644 --- a/src/apps/schema/src/store/parents.js +++ b/src/apps/schema/src/store/parents.js @@ -34,7 +34,7 @@ export function fetchParents() { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to fetch parents", }) ); }); diff --git a/src/apps/settings/src/app/views/Instance/Instance.js b/src/apps/settings/src/app/views/Instance/Instance.js index 4e12ebe791..b82fda77dd 100644 --- a/src/apps/settings/src/app/views/Instance/Instance.js +++ b/src/apps/settings/src/app/views/Instance/Instance.js @@ -144,7 +144,7 @@ export default connect((state) => { props.dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to save settings", }) ); }); diff --git a/src/apps/settings/src/app/views/Styles/Styles.js b/src/apps/settings/src/app/views/Styles/Styles.js index e197b57ad1..ec3d616e3a 100644 --- a/src/apps/settings/src/app/views/Styles/Styles.js +++ b/src/apps/settings/src/app/views/Styles/Styles.js @@ -131,7 +131,7 @@ export default connect((state, props) => { props.dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to save settings", }) ); }); diff --git a/src/shell/components/GlobalSearch/index.tsx b/src/shell/components/GlobalSearch/index.tsx index 20c91eed59..6c7d3de8bb 100644 --- a/src/shell/components/GlobalSearch/index.tsx +++ b/src/shell/components/GlobalSearch/index.tsx @@ -531,7 +531,7 @@ export const GlobalSearch = () => { dispatch( notify({ kind: "warn", - message: newVal.noUrlErrorMessage, + message: newVal.noUrlErrorMessage || "Invalid URL", }) ); } diff --git a/src/shell/store/auth.js b/src/shell/store/auth.js index 858a26703e..8c2c3cce27 100644 --- a/src/shell/store/auth.js +++ b/src/shell/store/auth.js @@ -187,7 +187,8 @@ export function pollTwoFactor() { dispatch( notify({ kind: "warn", - message: err.message, + message: + err.message || "Failed to validate Two Factor authentication", }) ); diff --git a/src/shell/store/content.js b/src/shell/store/content.js index 69f9e023be..f8790d87b1 100644 --- a/src/shell/store/content.js +++ b/src/shell/store/content.js @@ -361,7 +361,7 @@ export function fetchItems(modelZUID, options = {}) { dispatch( notify({ kind: "warn", - message: res.error, + message: res.error || "Failed to fetch items", }) ); } diff --git a/src/shell/store/releases.js b/src/shell/store/releases.js index bfe3f3196a..5b19ea10d0 100644 --- a/src/shell/store/releases.js +++ b/src/shell/store/releases.js @@ -284,7 +284,7 @@ export function createRelease(payload) { dispatch( notify({ kind: "warn", - message: res.error, + message: res.error || "Failed creating a release", }) ); } diff --git a/src/shell/store/settings.js b/src/shell/store/settings.js index 0c51eef357..588e6d6308 100644 --- a/src/shell/store/settings.js +++ b/src/shell/store/settings.js @@ -148,7 +148,7 @@ export function fetchSettings() { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to fetch settings", }) ); }); @@ -171,7 +171,7 @@ export function fetchStylesCategories() { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to fetch styles categories", }) ); }); @@ -193,7 +193,7 @@ export function fetchStylesVariables() { dispatch( notify({ kind: "warn", - message: err.message, + message: err.message || "Failed to fetch styles variables", }) ); }); diff --git a/src/shell/store/users.js b/src/shell/store/users.js index 255232d642..d409efca77 100644 --- a/src/shell/store/users.js +++ b/src/shell/store/users.js @@ -36,7 +36,7 @@ export function fetchUsers() { .catch((error) => { dispatch( notify({ - message: error.message, + message: error.message || "Failed to fetch users", kind: "error", }) ); diff --git a/src/utility/request.js b/src/utility/request.js index c1c23caf4d..a2344d0202 100644 --- a/src/utility/request.js +++ b/src/utility/request.js @@ -100,7 +100,7 @@ export function request(url, opts = {}) { throw err; } else { // Network errors - store.dispatch(notify({ message: err.message, kind: "warn" })); + store.dispatch(notify({ message: err.message || "", kind: "warn" })); return Promise.reject( err instanceof Error ? err