@ouroboros/mouth-mui 2.1.2 → 2.1.3

package/lib/components/pages/Locales.js

@@ -54,7 +54,7 @@ export default function Locales({ onError, onSuccess }) {
     useEffect(() => {
         // If we have read rights
         if (rights.read) {
-            mouth.read('locales').then(recordsSet);
+            mouth.read('locales').then((res) => recordsSet(res.data));
         }
         else {
             recordsSet([]);
@@ -69,9 +69,27 @@ export default function Locales({ onError, onSuccess }) {
         // Create a new Promise and return it
         return new Promise((resolve, reject) => {
             // Create the new locale
-            mouth.create('locale', locale).then((data) => {
+            mouth.create('locale', locale).then((res) => {
+                // If we failed
+                if (res.error) {
+                    if (res.error.code === errors.body.DB_NO_RECORD) {
+                        return reject([['_id', 'Already in use']]);
+                    }
+                    else if (res.error.code === errors.body.DATA_FIELDS) {
+                        return reject(res.error.msg);
+                    }
+                    else {
+                        if (onError) {
+                            onError(res.error);
+                            return reject([]);
+                        }
+                        else {
+                            throw new Error(JSON.stringify(res.error));
+                        }
+                    }
+                }
                 // If we were successful
-                if (data) {
+                if (res.data) {
                     // Notify the parent
                     if (onSuccess) {
                         onSuccess('create');
@@ -86,31 +104,25 @@ export default function Locales({ onError, onSuccess }) {
                     locales.set(lRecords);
                 }
                 // Resolve with the form
-                resolve(data ? true : false);
-            }, (error) => {
-                if (error.code === errors.body.DB_NO_RECORD) {
-                    reject([['_id', 'Already in use']]);
-                }
-                else if (error.code === errors.body.DATA_FIELDS) {
-                    reject(error.msg);
-                }
-                else {
-                    if (onError) {
-                        onError(error);
-                    }
-                    else {
-                        throw new Error(JSON.stringify(error));
-                    }
-                }
+                resolve(res.data ? true : false);
             });
         });
     }
     // Called when the delete button on a locale was clicked
     function deleteClick(key) {
         // Delete the existing locale
-        mouth.delete('locale', { _id: key }).then((data) => {
+        mouth.delete('locale', { _id: key }).then((res) => {
+            // If we failed
+            if (res.error) {
+                if (onError) {
+                    return onError(res.error);
+                }
+                else {
+                    throw new Error(JSON.stringify(res.error));
+                }
+            }
             // If it was successful
-            if (data) {
+            if (res.data) {
                 // Notify the parent
                 if (onSuccess) {
                     onSuccess('delete');
@@ -128,13 +140,6 @@ export default function Locales({ onError, onSuccess }) {
                     locales.set(lRecords);
                 }
             }
-        }, (error) => {
-            if (onError) {
-                onError(error);
-            }
-            else {
-                throw new Error(JSON.stringify(error));
-            }
         });
     }
     // Called when an update form is submitted
@@ -144,9 +149,24 @@ export default function Locales({ onError, onSuccess }) {
         // Create a new Promise and return it
         return new Promise((resolve, reject) => {
             // Update the locale on the server
-            mouth.update('locale', locale).then((data) => {
+            mouth.update('locale', locale).then((res) => {
+                // If we failed
+                if (res.error) {
+                    if (res.error.code === errors.body.DATA_FIELDS) {
+                        return reject(res.error.msg);
+                    }
+                    else {
+                        if (onError) {
+                            onError(res.error);
+                            return reject([]);
+                        }
+                        else {
+                            throw new Error(JSON.stringify(res.error));
+                        }
+                    }
+                }
                 // If we were successful
-                if (data) {
+                if (res.data) {
                     // Notify the parent
                     if (onSuccess) {
                         onSuccess('update');
@@ -165,19 +185,7 @@ export default function Locales({ onError, onSuccess }) {
                     }
                 }
                 // Resolve with the Form
-                resolve(data);
-            }, (error) => {
-                if (error.code === errors.body.DATA_FIELDS) {
-                    reject(error.msg);
-                }
-                else {
-                    if (onError) {
-                        onError(error);
-                    }
-                    else {
-                        throw new Error(JSON.stringify(error));
-                    }
-                }
+                resolve(res.data);
             });
         });
     }

package/lib/components/pages/Templates/Create.js

@@ -51,23 +51,26 @@ export default function Create({ onCancel, onCreated, onError }) {
     // Called to create the template
     function create() {
         // Create the data in the system
-        mouth.create('template', record).then((data) => {
-            // Add the ID to the record
-            record._id = data;
-            // Let the parent know
-            onCreated({ ...record });
-        }, (error) => {
-            if (error.code === errors.body.DB_DUPLICATE) {
-                refName.current?.error('Duplicate');
-            }
-            else {
-                if (onError) {
-                    onError(error);
+        mouth.create('template', record).then((res) => {
+            // If we failed
+            if (res.error) {
+                if (res.error.code === errors.body.DB_DUPLICATE) {
+                    refName.current?.error('Duplicate');
                 }
                 else {
-                    throw new Error(JSON.stringify(error));
+                    if (onError) {
+                        onError(res.error);
+                        return;
+                    }
+                    else {
+                        throw new Error(JSON.stringify(res.error));
+                    }
                 }
             }
+            // Add the ID to the record
+            record._id = res.data;
+            // Let the parent know
+            onCreated({ ...record });
         });
     }
     // Render

package/lib/components/pages/Templates/Template/Content/Create/index.js

@@ -50,49 +50,52 @@ export default function Create({ locales, onCreated, onError, template }) {
     // Called to create the new content record
     function create() {
         // Send the record data to the server
-        mouth.create(`template/${type}`, record).then((data) => {
-            // Add the type and ID
-            const oRecord = { ...record, type, _id: data };
-            // Tell the parent about the new record
-            onCreated(oRecord);
-        }, (error) => {
-            if (error.code === errors.body.DATA_FIELDS) {
-                fieldErrorsSet(errorTree(error.msg));
-            }
-            else if (error.code === errors.body.DB_DUPLICATE) {
-                fieldErrorsSet({ locale: 'Already used' });
-            }
-            else if (error.code === errors.TEMPLATE_CONTENT_ERROR) {
-                const oLines = { 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.create(`template/${type}`, record).then((res) => {
+            // If we failed
+            if (res.error) {
+                if (res.error.code === errors.body.DATA_FIELDS) {
+                    fieldErrorsSet(errorTree(res.error.msg));
                 }
-                const lLines = [];
-                if (oLines.templates.length) {
-                    lLines.push('The following templates are invalid: ' + oLines.templates.join(', '));
+                else if (res.error.code === errors.body.DB_DUPLICATE) {
+                    fieldErrorsSet({ locale: 'Already used' });
                 }
-                if (oLines.variables.length) {
-                    lLines.push('The following variables are invalid: ' + oLines.variables.join(', '));
+                else if (res.error.code === errors.TEMPLATE_CONTENT_ERROR) {
+                    const oLines = { 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(', '));
+                    }
+                    // Show the errors
+                    if (onError) {
+                        onError({ code: 0, msg: lLines.join('\n') });
+                    }
+                    else {
+                        throw new Error(JSON.stringify(res.error));
+                    }
                 }
-                // Show the errors
-                if (onError) {
-                    onError({ code: 0, msg: lLines.join('\n') });
+                else if (onError) {
+                    onError(res.error);
                 }
                 else {
-                    throw new Error(JSON.stringify(error));
+                    throw new Error(JSON.stringify(res.error));
                 }
+                return;
             }
-            else if (onError) {
-                onError(error);
-            }
-            else {
-                throw new Error(JSON.stringify(error));
-            }
+            // Add the type and ID
+            const oRecord = { ...record, type, _id: res.data };
+            // Tell the parent about the new record
+            onCreated(oRecord);
         });
     }
     // Called when any fields in the record are changed

package/lib/components/pages/Templates/Template/Content/Preview/index.js

@@ -33,13 +33,19 @@ export default function Preview({ onClose, onError, value }) {
     const [preview, previewSet] = useState(false);
     // Value effect
     useEffect(() => {
-        mouth.create(`template/${value.type}/generate`, value).then(previewSet, error => {
-            if (onError) {
-                onError(error);
-            }
-            else {
-                throw new Error(JSON.stringify(error));
+        mouth.create(`template/${value.type}/generate`, value).then((res) => {
+            // If we failed
+            if (res.error) {
+                if (onError) {
+                    onError(res.error);
+                    return;
+                }
+                else {
+                    throw new Error(JSON.stringify(res.error));
+                }
             }
+            // Set the preview
+            previewSet(res.data);
         });
     }, [value, onError]);
     // Render

package/lib/components/pages/Templates/Template/Content/Update/index.js

@@ -38,40 +38,44 @@ export default function Update({ onError, onUpdated, value }) {
     // Called to create the new content record
     function update() {
         // Send the record data to the server
-        mouth.update(`template/${value.type}`, record).then(() => {
-            onUpdated({ type: value.type, ...record });
-        }, (error) => {
-            if (error.code === errors.body.DATA_FIELDS) {
-                fieldErrorsSet(errorTree(error.msg));
-            }
-            else if (error.code === errors.TEMPLATE_CONTENT_ERROR) {
-                const oLines = { templates: [], variables: [] };
-                for (const l of error.msg) {
-                    if (l[0] === 'template') {
-                        oLines.templates.push(l[1]);
+        mouth.update(`template/${value.type}`, record).then((res) => {
+            // 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: [], 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]);
+                        }
                     }
-                    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(', '));
+                    }
+                    // Show the errors
+                    if (onError) {
+                        onError({ code: 0, msg: lLines.join('\n') });
                     }
                 }
-                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(', '));
+                else if (onError) {
+                    onError(res.error);
                 }
-                // Show the errors
-                if (onError) {
-                    onError({ code: 0, msg: lLines.join('\n') });
+                else {
+                    throw new Error(JSON.stringify(res.error));
                 }
+                return;
             }
-            else if (onError) {
-                onError(error);
-            }
-            else {
-                throw new Error(JSON.stringify(error));
-            }
+            // Let the parent know it was updated
+            onUpdated({ type: value.type, ...record });
         });
     }
     // Called when any fields in the record are changed

package/lib/components/pages/Templates/Template/index.js

@@ -76,18 +76,26 @@ export default function Template({ locales, onChange, onError, onContent, rights
     // Called to update the template
     function update() {
         // Create the data in the system
-        mouth.update('template', edit).then((data) => {
+        mouth.update('template', edit).then((res) => {
+            // 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);
-        }, (error) => {
-            if (error.code === errors.body.DB_DUPLICATE) {
-                refName.current?.error('Duplicate');
-            }
-            else {
-                return false;
-            }
         });
     }
     // View toggle
@@ -99,7 +107,7 @@ export default function Template({ locales, onChange, onError, onContent, rights
             if (contents === false) {
                 mouth.read('template/contents', {
                     template: value._id
-                }).then(contentsSet);
+                }).then((res) => contentsSet(res.data));
             }
             viewSet(true);
         }

package/lib/components/pages/Templates/index.js

@@ -42,14 +42,14 @@ export default function Templates({ onError, onSuccess }) {
     useEffect(() => {
         // If we have template read permissions
         if (rightsTemplate.read) {
-            mouth.read('locales').then((data) => {
+            mouth.read('locales').then((res) => {
                 const oLocales = {};
-                for (const o of data) {
+                for (const o of res.data) {
                     oLocales[o._id] = o.name;
                 }
                 localesSet(oLocales);
             });
-            mouth.read('templates').then(templatesSet);
+            mouth.read('templates').then((res) => templatesSet(res.data));
         }
         else {
             localesSet({});

package/lib/locales.js

@@ -139,28 +139,31 @@ class Locales extends Subscribe {
         // Mark us as running
         this.fetching = true;
         // Fetch the data from the server
-        mouth.read('locales').then((list) => {
+        mouth.read('locales').then((res) => {
+            // 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
             this.fetching = false;
             // 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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ouroboros/mouth-mui",
-	"version": "2.1.2",
+	"version": "2.1.3",
 	"description": "Components for use with the Mouth service",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
@@ -28,27 +28,26 @@
 	"devDependencies": {
 		"@types/node": "^18.14.0",
 		"@types/react": "^18.0.28",
-		"@types/uuid": "^9.0.0",
 		"tslint": "^6.1.3",
 		"tslint-config-prettier": "^1.18.0",
-		"typescript": "^4.8.3"
+		"typescript": "^5.9.3"
 	},
 	"dependencies": {
 		"@ouroboros/define": "^1.1.3",
 		"@ouroboros/define-mui": "^1.5.6",
-		"@ouroboros/mouth": "^2.1.2",
+		"@ouroboros/mouth": "^2.2.0",
 		"@ouroboros/react-radiobuttons-mui": "^1.1.0",
 		"@ouroboros/subscribe": "^1.3.2",
-		"@ouroboros/tools": "^0.7.1",
+		"@ouroboros/tools": "^0.7.3",
 		"prop-types": "^15.8.1"
 	},
 	"peerDependencies": {
-		"@emotion/react": "^11.8.2",
-		"@emotion/styled": "^11.8.1",
+		"@emotion/react": "^11.14.0",
+		"@emotion/styled": "^11.14.1",
 		"@mui/material": "^5.5.1",
-		"@ouroboros/body": "^1.2.0",
-		"@ouroboros/brain-react": "^2.3.1",
-		"@ouroboros/events": "^1.1.0",
+		"@ouroboros/body": "^1.3.0",
+		"@ouroboros/brain-react": "^2.3.3",
+		"@ouroboros/events": "^1.1.3",
 		"react": "^17.0.2 || ^18.0.0",
 		"react-dom": "^17.0.2 || ^18.0.0"
 	}

package/releases.md

@@ -1,5 +1,8 @@
 # @ouroboros/mouth-mui releases
 
+## 2.1.3
+- Updated `@ouroboros/body` and `@ouroboros/mouth` to latest
+
 ## 2.1.2
 - Completed documentation.
 

package/src/components/pages/Locales.tsx

@@ -42,7 +42,7 @@ const LocaleTree = new Tree(LocaleDef, {
 });
 
 // Types
-import { responseErrorStruct } from '@ouroboros/body';
+import { responseErrorStruct, responseStruct } from '@ouroboros/body';
 export type LocalesProps = {
 	onError: (error: responseErrorStruct) => void,
 	onSuccess: (type: string) => void
@@ -72,9 +72,9 @@ export default function Locales({ onError, onSuccess }: LocalesProps) {
 
 		// If we have read rights
 		if(rights.read) {
-			mouth.read('locales').then(recordsSet);
+			mouth.read('locales').then((res: responseStruct) => recordsSet(res.data));
 		} else {
-			recordsSet([]);
+			recordsSet([ ]);
 		}
 
 		// If we don't have create rights
@@ -91,10 +91,26 @@ export default function Locales({ onError, onSuccess }: LocalesProps) {
 		return new Promise((resolve, reject) => {
 
 			// Create the new locale
-			mouth.create('locale', locale).then((data: string) => {
+			mouth.create('locale', locale).then((res: responseStruct) => {
+
+				// If we failed
+				if(res.error) {
+					if(res.error.code === errors.body.DB_NO_RECORD) {
+						return reject([['_id', 'Already in use']]);
+					} else if(res.error.code === errors.body.DATA_FIELDS) {
+						return reject(res.error.msg);
+					} else {
+						if(onError) {
+							onError(res.error);
+							return reject([ ]);
+						} else {
+							throw new Error(JSON.stringify(res.error));
+						}
+					}
+				}
 
 				// If we were successful
-				if(data) {
+				if(res.data) {
 
 					// Notify the parent
 					if(onSuccess) {
@@ -114,20 +130,7 @@ export default function Locales({ onError, onSuccess }: LocalesProps) {
 				}
 
 				// Resolve with the form
-				resolve(data ? true : false);
-
-			}, (error: responseErrorStruct) => {
-				if(error.code === errors.body.DB_NO_RECORD) {
-					reject([['_id', 'Already in use']]);
-				} else if(error.code === errors.body.DATA_FIELDS) {
-					reject(error.msg);
-				} else {
-					if(onError) {
-						onError(error);
-					} else {
-						throw new Error(JSON.stringify(error));
-					}
-				}
+				resolve(res.data ? true : false);
 			});
 		});
 	}
@@ -136,10 +139,19 @@ export default function Locales({ onError, onSuccess }: LocalesProps) {
 	function deleteClick(key: string) {
 
 		// Delete the existing locale
-		mouth.delete('locale', { _id: key }).then((data: boolean) => {
+		mouth.delete('locale', { _id: key }).then((res: responseStruct) => {
+
+			// If we failed
+			if(res.error) {
+				if(onError) {
+					return onError(res.error);
+				} else {
+					throw new Error(JSON.stringify(res.error));
+				}
+			}
 
 			// If it was successful
-			if(data) {
+			if(res.data) {
 
 				// Notify the parent
 				if(onSuccess) {
@@ -162,12 +174,6 @@ export default function Locales({ onError, onSuccess }: LocalesProps) {
 					locales.set(lRecords);
 				}
 			}
-		}, (error: responseErrorStruct) => {
-			if(onError) {
-				onError(error);
-			} else {
-				throw new Error(JSON.stringify(error));
-			}
 		});
 	}
 
@@ -181,10 +187,24 @@ export default function Locales({ onError, onSuccess }: LocalesProps) {
 		return new Promise((resolve, reject) => {
 
 			// Update the locale on the server
-			mouth.update('locale', locale).then((data: boolean) => {
+			mouth.update('locale', locale).then((res: responseStruct) => {
+
+				// If we failed
+				if(res.error) {
+					if(res.error.code === errors.body.DATA_FIELDS) {
+						return reject(res.error.msg);
+					} else {
+						if(onError) {
+							onError(res.error);
+							return reject([ ]);
+						} else {
+							throw new Error(JSON.stringify(res.error));
+						}
+					}
+				}
 
 				// If we were successful
-				if(data) {
+				if(res.data) {
 
 					// Notify the parent
 					if(onSuccess) {
@@ -209,18 +229,7 @@ export default function Locales({ onError, onSuccess }: LocalesProps) {
 				}
 
 				// Resolve with the Form
-				resolve(data);
-
-			}, (error: responseErrorStruct) => {
-				if(error.code === errors.body.DATA_FIELDS) {
-					reject(error.msg);
-				} else {
-					if(onError) {
-						onError(error);
-					} else {
-						throw new Error(JSON.stringify(error));
-					}
-				}
+				resolve(res.data);
 			});
 		});
 	}

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

@@ -30,7 +30,7 @@ import Variables from './Template/Variables';
 const oNameNode = new Node(TemplateDef.name);
 
 // Types
-import { responseErrorStruct } from '@ouroboros/body';
+import { responseErrorStruct, responseStruct } from '@ouroboros/body';
 import { templateStruct } from './Template';
 export interface CreateProps {
 	onCancel?: () => void,
@@ -53,7 +53,7 @@ export default function Create({ onCancel, onCreated, onError }: CreateProps) {
 	// State
 	const [ record, recordSet ] = useState<templateStruct>({
 		name: '',
-		variables: {}
+		variables: { }
 	});
 
 	// Refs
@@ -72,24 +72,28 @@ export default function Create({ onCancel, onCreated, onError }: CreateProps) {
 	function create() {
 
 		// Create the data in the system
-		mouth.create('template', record).then((data: string) => {
+		mouth.create('template', record).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);
+						return;
+					} else {
+						throw new Error(JSON.stringify(res.error));
+					}
+				}
+			}
 
 			// Add the ID to the record
-			record._id = data;
+			record._id = res.data;
 
 			// Let the parent know
 			onCreated({ ...record });
-		}, (error: responseErrorStruct) => {
-			if(error.code === errors.body.DB_DUPLICATE) {
-				refName.current?.error('Duplicate');
-			} else {
-				if(onError) {
-					onError(error);
-				} else {
-					throw new Error(JSON.stringify(error));
-				}
-			}
-		})
+		});
 	}
 
 	// Render

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

@@ -32,7 +32,7 @@ import SMS from './SMS';
 
 // Types
 import { contentStruct, typeOption } from '../../';
-import { responseErrorStruct } from '@ouroboros/body';
+import { responseErrorStruct, responseStruct } from '@ouroboros/body';
 export type TemplateContentCreateProps = {
 	locales: Record<string, string>,
 	onCreated: (content: contentStruct) => void,
@@ -55,62 +55,66 @@ export default function Create(
 ) {
 
 	// State
-	const [fieldErrors, fieldErrorsSet] = useState<Record<string, any>>({});
-	const [preview, previewSet] = useState(false);
-	const [record, recordSet] = useState<Omit<contentStruct, 'type'>>({
+	const [ fieldErrors, fieldErrorsSet ] = useState<Record<string, any>>({});
+	const [ preview, previewSet ] = useState(false);
+	const [ record, recordSet ] = useState<Omit<contentStruct, 'type'>>({
 		locale: Object.keys(locales)[0],
 		template,
 		subject: '',
 		text: '',
 		html: ''
 	})
-	const [type, typeSet] = useState<typeOption>('email');
+	const [ type, typeSet ] = useState<typeOption>('email');
 
 	// Called to create the new content record
 	function create() {
 
 		// Send the record data to the server
-		mouth.create(`template/${type}`, record).then((data: string) => {
+		mouth.create(`template/${type}`, record).then((res: responseStruct) => {
 
-			// Add the type and ID
-			const oRecord = { ...record, type, _id: data }
-
-			// Tell the parent about the new record
-			onCreated(oRecord);
-
-		}, (error: responseErrorStruct) => {
-			if(error.code === errors.body.DATA_FIELDS) {
-				fieldErrorsSet(errorTree(error.msg));
-			} else if(error.code === errors.body.DB_DUPLICATE) {
-				fieldErrorsSet({ locale: 'Already used' });
-			} 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]);
+			// 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.body.DB_DUPLICATE) {
+					fieldErrorsSet({ locale: 'Already used' });
+				} 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 {
+						throw new Error(JSON.stringify(res.error));
+					}
+				} else if(onError) {
+					onError(res.error);
 				} else {
-					throw new Error(JSON.stringify(error));
+					throw new Error(JSON.stringify(res.error));
 				}
-			} else if(onError) {
-				onError(error);
-			} else {
-				throw new Error(JSON.stringify(error));
+				return;
 			}
+
+			// Add the type and ID
+			const oRecord = { ...record, type, _id: res.data }
+
+			// Tell the parent about the new record
+			onCreated(oRecord);
+
 		});
 	}
 

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

@@ -27,7 +27,7 @@ import SMS from './SMS';
 
 // Types
 import { contentStruct } from '../..';
-import { responseErrorStruct } from '@ouroboros/body';
+import { responseErrorStruct, responseStruct } from '@ouroboros/body';
 export type PreviewProps = {
 	onClose: () => void,
 	onError?: (error: responseErrorStruct) => void,
@@ -54,12 +54,21 @@ export default function Preview({ onClose, onError, value }: PreviewProps) {
 		mouth.create(
 			`template/${value.type}/generate`,
 			value
-		).then(previewSet, error => {
-			if(onError) {
-				onError(error);
-			} else {
-				throw new Error(JSON.stringify(error));
+		).then((res: responseStruct) => {
+
+			// If we failed
+			if(res.error) {
+				if(onError) {
+					onError(res.error);
+					return;
+				} else {
+					throw new Error(JSON.stringify(res.error));
+				}
 			}
+
+			// Set the preview
+			previewSet(res.data);
+
 		})
 	}, [ value, onError ]);
 

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

@@ -26,7 +26,7 @@ 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 = {
@@ -56,37 +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 if(onError) {
-				onError(error);
-			} else {
-				throw new Error(JSON.stringify(error));
+				return;
 			}
+
+			// Let the parent know it was updated
+			onUpdated({type: value.type, ...record});
 		});
 	}
 

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,
@@ -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);
 		}

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

@@ -26,7 +26,7 @@ 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
@@ -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([]);

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;
-		})
+		});
 	}
 
 	/**