@ouroboros/mouth-mui 2.1.1 → 2.1.3

package/src/components/pages/Templates/Template/Content/Update/index.tsx

@@ -26,11 +26,11 @@ import Preview from '../Preview';
 import SMS from './SMS';
 
 // Types
-import { responseErrorStruct } from '@ouroboros/body';
+import { responseErrorStruct, responseStruct } from '@ouroboros/body';
 import { contentStruct } from '../..';
 export type updateStruct = Omit<contentStruct, 'type'>;
 export type UpdateProps = {
-	onError: (error: responseErrorStruct) => void,
+	onError?: (error: responseErrorStruct) => void,
 	onUpdated: (content: contentStruct) => void,
 	value: contentStruct
 }
@@ -56,35 +56,43 @@ export default function Update({ onError, onUpdated, value }: UpdateProps) {
 	function update() {
 
 		// Send the record data to the server
-		mouth.update(`template/${value.type}`, record).then(() => {
-			onUpdated({type: value.type, ...record});
-		}, (error: responseErrorStruct) => {
-			if(error.code === errors.body.DATA_FIELDS) {
-				fieldErrorsSet(errorTree(error.msg));
-			} else if(error.code === errors.TEMPLATE_CONTENT_ERROR) {
-				const oLines: { templates: string[], variables: string[] } = { templates: [], variables: [] };
-				for(const l of error.msg) {
-					if(l[0] === 'template') {
-						oLines.templates.push(l[1]);
-					} else if(l[0] === 'variable') {
-						oLines.variables.push(l[1]);
+		mouth.update(`template/${value.type}`, record).then((res: responseStruct) => {
+
+			// If we failed
+			if(res.error) {
+				if(res.error.code === errors.body.DATA_FIELDS) {
+					fieldErrorsSet(errorTree(res.error.msg));
+				} else if(res.error.code === errors.TEMPLATE_CONTENT_ERROR) {
+					const oLines: { templates: string[], variables: string[] } = { templates: [], variables: [] };
+					for(const l of res.error.msg) {
+						if(l[0] === 'template') {
+							oLines.templates.push(l[1]);
+						} else if(l[0] === 'variable') {
+							oLines.variables.push(l[1]);
+						}
+					}
+					const lLines = [];
+					if(oLines.templates.length) {
+						lLines.push('The following templates are invalid: ' + oLines.templates.join(', '));
+					}
+					if(oLines.variables.length) {
+						lLines.push('The following variables are invalid: ' + oLines.variables.join(', '));
 					}
-				}
-				const lLines = [];
-				if(oLines.templates.length) {
-					lLines.push('The following templates are invalid: ' + oLines.templates.join(', '));
-				}
-				if(oLines.variables.length) {
-					lLines.push('The following variables are invalid: ' + oLines.variables.join(', '));
-				}
 
-				// Show the errors
-				if(onError) {
-					onError({ code: 0, msg: lLines.join('\n') });
+					// Show the errors
+					if(onError) {
+						onError({ code: 0, msg: lLines.join('\n') });
+					}
+				} else if(onError) {
+					onError(res.error);
+				} else {
+					throw new Error(JSON.stringify(res.error));
 				}
-			} else {
-				onError(error);
+				return;
 			}
+
+			// Let the parent know it was updated
+			onUpdated({type: value.type, ...record});
 		});
 	}
 
@@ -128,8 +136,10 @@ export default function Update({ onError, onUpdated, value }: UpdateProps) {
 						onError={(error: responseErrorStruct) => {
 							if(error.code === errors.body.DATA_FIELDS) {
 								fieldErrorsSet(errorTree(error.msg));
-							} else {
+							} else if(onError) {
 								onError(error);
+							} else {
+								throw new Error(JSON.stringify(error));
 							}
 							previewSet(false);
 						}}

package/src/components/pages/Templates/Template/Content/View/index.tsx

@@ -24,7 +24,7 @@ import SMS from './SMS';
 import { responseErrorStruct } from '@ouroboros/body';
 import { contentStruct } from '../..';
 export type ViewProps = {
-	onError: (error: responseErrorStruct) => void,
+	onError?: (error: responseErrorStruct) => void,
 	value: contentStruct
 }
 
@@ -67,7 +67,7 @@ export default function View({ onError, value }: ViewProps) {
 
 // Valid props
 View.propTypes = {
-	onError: PropTypes.func.isRequired,
+	onError: PropTypes.func,
 	value: PropTypes.shape({
 		_id: PropTypes.string.isRequired,
 		type: PropTypes.oneOf([ 'email', 'sms' ]).isRequired

package/src/components/pages/Templates/Template/index.tsx

@@ -36,7 +36,7 @@ import ContentView from './Content/View';
 import Variables from './Variables';
 
 // Types
-import { responseErrorStruct } from '@ouroboros/body';
+import { responseErrorStruct, responseStruct } from '@ouroboros/body';
 import { idStruct } from '@ouroboros/brain-react';
 export type contentStruct = {
 	_id?: string,
@@ -61,7 +61,7 @@ export type typeOption = 'email' | 'sms';
 export type TemplateProps = {
 	locales: Record<string, string>,
 	onChange: (template: templateStruct) => void,
-	onError: (error: responseErrorStruct) => void,
+	onError?: (error: responseErrorStruct) => void,
 	onContent: (type: string) => void,
 	rights: {
 		template: idStruct,
@@ -134,21 +134,28 @@ export default function Template(
 	function update() {
 
 		// Create the data in the system
-		mouth.update('template', edit).then((data: boolean) => {
+		mouth.update('template', edit).then((res: responseStruct) => {
+
+			// If we failed
+			if(res.error) {
+				if(res.error.code === errors.body.DB_DUPLICATE) {
+					refName.current?.error('Duplicate');
+				} else {
+					if(onError) {
+						onError(res.error);
+					} else {
+						throw new Error(JSON.stringify(res.error));
+					}
+				}
+				return;
+			}
 
 			// Hide the form
 			editSet(false);
 
 			// Let the parent know
 			onChange(edit as templateStruct);
-
-		}, (error: responseErrorStruct) => {
-			if(error.code === errors.body.DB_DUPLICATE) {
-				refName.current?.error('Duplicate');
-			} else {
-				return false;
-			}
-		})
+		});
 	}
 
 	// View toggle
@@ -159,7 +166,7 @@ export default function Template(
 			if(contents === false) {
 				mouth.read('template/contents', {
 					template: value._id
-				}).then(contentsSet);
+				}).then((res: responseStruct) => contentsSet(res.data));
 			}
 			viewSet(true);
 		}
@@ -289,7 +296,7 @@ export default function Template(
 Template.propTypes = {
 	locales: PropTypes.objectOf(PropTypes.string).isRequired,
 	onChange: PropTypes.func.isRequired,
-	onError: PropTypes.func.isRequired,
+	onError: PropTypes.func,
 	onContent: PropTypes.func.isRequired,
 	rights: PropTypes.exact({
 		template: PropTypes.exact({

package/src/components/pages/Templates/index.tsx

@@ -26,10 +26,10 @@ import Create from './Create'
 import Template, { templateStruct } from './Template';
 
 // Types
-import { responseErrorStruct } from '@ouroboros/body';
+import { responseErrorStruct, responseStruct } from '@ouroboros/body';
 export type TemplatesProps = {
-	onError: (error: responseErrorStruct) => void,
-	onSuccess: (type: string) => void
+	onError?: (error: responseErrorStruct) => void,
+	onSuccess?: (type: string) => void
 }
 
 /**
@@ -58,14 +58,14 @@ export default function Templates({ onError, onSuccess }: TemplatesProps) {
 
 		// If we have template read permissions
 		if(rightsTemplate.read) {
-			mouth.read('locales').then((data: Record<string, any>[]) => {
-				const oLocales: Record<string, string> = {};
-				for(const o of data) {
+			mouth.read('locales').then((res: responseStruct) => {
+				const oLocales: Record<string, string> = { };
+				for(const o of res.data) {
 					oLocales[o._id] = o.name;
 				}
 				localesSet(oLocales);
 			});
-			mouth.read('templates').then(templatesSet);
+			mouth.read('templates').then((res: responseStruct) => templatesSet(res.data));
 		} else {
 			localesSet({});
 			templatesSet([]);
@@ -82,7 +82,9 @@ export default function Templates({ onError, onSuccess }: TemplatesProps) {
 	function templateCreated(template: templateStruct) {
 
 		// Notify parent
-		onSuccess('template_create');
+		if(onSuccess) {
+			onSuccess('template_create');
+		}
 
 		// Hide the create form
 		createSet(false);
@@ -96,7 +98,9 @@ export default function Templates({ onError, onSuccess }: TemplatesProps) {
 	function templateUpdated(template: templateStruct) {
 
 		// Notify parent
-		onSuccess('template_update');
+		if(onSuccess) {
+			onSuccess('template_update');
+		}
 
 		// Work on latest
 		templatesSet(l =>
@@ -133,7 +137,11 @@ export default function Templates({ onError, onSuccess }: TemplatesProps) {
 					key={o._id}
 					locales={locales}
 					onChange={templateUpdated}
-					onContent={type => onSuccess(`content_${type}`)}
+					onContent={type => {
+						if(onSuccess) {
+							onSuccess(`content_${type}`)
+						}
+					}}
 					onError={onError}
 					rights={{
 						content: rightsContent,
@@ -148,6 +156,6 @@ export default function Templates({ onError, onSuccess }: TemplatesProps) {
 
 // Valid props
 Templates.propTypes = {
-	onError: PropTypes.func.isRequired,
-	onSuccess: PropTypes.func.isRequired
+	onError: PropTypes.func,
+	onSuccess: PropTypes.func
 }

package/src/locales.ts

@@ -16,6 +16,7 @@ import Subscribe, { SubscribeCallback, SubscribeReturn } from '@ouroboros/subscr
 import mouth from '@ouroboros/mouth';
 
 // Types
+import { responseStruct } from '@ouroboros/body';
 export type Option = {
 	id: string,
 	text: string
@@ -171,13 +172,33 @@ class Locales extends Subscribe {
 		this.fetching = true;
 
 		// Fetch the data from the server
-		mouth.read('locales').then((list: any) => {
+		mouth.read('locales').then((res: responseStruct) => {
+
+			// If we failed
+			if(res.error) {
+
+				// If we haven't hit the limit
+				if(this.failed < 3) {
+
+					// Increase the failed count
+					++this.failed;
+
+					// Fetch again
+					this.fetch();
+				}
+
+				// Else, we can't keep trying, notify the user
+				else {
+					events.get('error').trigger(res.error);
+				}
+				return;
+			}
 
 			// If there's data
-			if(list) {
+			if(res.data) {
 
 				// Trigger all callbacks
-				this.set(list);
+				this.set(res.data);
 			}
 
 			// Finish running
@@ -185,29 +206,11 @@ class Locales extends Subscribe {
 
 			// Reset the count
 			this.failed = 0;
-
-		}, error => {
-
-			// If we haven't hit the limit
-			if(this.failed < 3) {
-
-				// Increase the failed count
-				++this.failed;
-
-				// Fetch again
-				this.fetch();
-			}
-
-			// Else, we can't keep trying, notify the user
-			else {
-				events.get('error').trigger(error);
-			}
-
 		}).finally(() => {
 
 			// Regardless of the outcome, we're done fetching
 			this.fetching = false;
-		})
+		});
 	}
 
 	/**