tsondb 0.8.4 → 0.8.5

package/dist/src/web/components/InstanceRouteSkeleton.d.ts

@@ -12,6 +12,21 @@ export type InstanceRouteSkeletonInitializer = (values: {
     setInstanceContent: Dispatch<SetStateAction<unknown>>;
     getDeclFromDeclName: GetDeclFromDeclName;
 }) => Promise<void>;
+export type InstanceRouteSkeletonSubmitHandler<A extends string = string> = (values: {
+    locales: string[];
+    entity: SerializedEntityDecl;
+    instanceId: string | undefined;
+    instanceContent: unknown;
+    action: A;
+    customId: string;
+    isLocaleEntity: boolean | undefined;
+    childInstances: UnsafeEntityTaggedInstanceContainerWithChildInstances[];
+    route: LocationHook["route"];
+    setInstanceContent: Dispatch<SetStateAction<unknown>>;
+    setCustomId: Dispatch<SetStateAction<string>>;
+    getDeclFromDeclName: GetDeclFromDeclName;
+    updateLocalGitState?: () => Promise<void>;
+}) => Promise<void>;
 export type InstanceRouteSkeletonOnSubmitHandler = (values: {
     locales: string[];
     entity: SerializedEntityDecl;
@@ -27,6 +42,20 @@ export type InstanceRouteSkeletonOnSubmitHandler = (values: {
     getDeclFromDeclName: GetDeclFromDeclName;
     updateLocalGitState?: () => Promise<void>;
 }) => Promise<void>;
+export type InstanceRouteSkeletonOnSaveHandler = (values: {
+    locales: string[];
+    entity: SerializedEntityDecl;
+    instanceId: string | undefined;
+    instanceContent: unknown;
+    customId: string;
+    isLocaleEntity: boolean | undefined;
+    childInstances: UnsafeEntityTaggedInstanceContainerWithChildInstances[];
+    route: LocationHook["route"];
+    setInstanceContent: Dispatch<SetStateAction<unknown>>;
+    setCustomId: Dispatch<SetStateAction<string>>;
+    getDeclFromDeclName: GetDeclFromDeclName;
+    updateLocalGitState?: () => Promise<void>;
+}) => Promise<void>;
 export type InstanceRouteSkeletonTitleBuilder = (values: {
     locales: string[];
     entity: SerializedEntityDecl;
@@ -43,6 +72,7 @@ type Props = {
     init: InstanceRouteSkeletonInitializer;
     titleBuilder: InstanceRouteSkeletonTitleBuilder;
     onSubmit: InstanceRouteSkeletonOnSubmitHandler;
+    onSave: InstanceRouteSkeletonOnSaveHandler;
 };
 export declare const InstanceRouteSkeleton: FunctionalComponent<Props>;
 export {};

package/dist/src/web/components/InstanceRouteSkeleton.js

@@ -24,7 +24,11 @@ const onBeforeUnload = (event) => {
     // eslint-disable-next-line @typescript-eslint/no-deprecated -- best practice according to MDN
     event.returnValue = "unsaved changes";
 };
-export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSubmit, }) => {
+const applePlatformPattern = /(Mac|iPhone|iPod|iPad)/i;
+// eslint-disable-next-line @typescript-eslint/no-deprecated
+const isApplePlatform = () => applePlatformPattern.test(window.navigator.platform);
+const checkCmdOrCtrl = (event) => (isApplePlatform() ? event.metaKey : event.ctrlKey);
+export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSubmit, onSave, }) => {
     const { params: { name, id }, } = useRoute();
     const [locales] = useSetting("displayedLocales");
     const [getDeclFromDeclName, declsLoaded] = useGetDeclFromDeclName();
@@ -38,6 +42,42 @@ export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSub
     const client = useContext(GitClientContext);
     const { route } = useLocation();
     const hasUnsavedChanges = useMemo(() => !deepEqual(instanceContent, savedInstanceContent), [instanceContent, savedInstanceContent]);
+    const saveHandler = useCallback((event) => {
+        if (checkCmdOrCtrl(event) && event.key === "s" && entity && instanceContent !== undefined) {
+            event.preventDefault();
+            runWithLoading(() => onSave({
+                locales,
+                entity,
+                instanceId: id,
+                instanceContent,
+                route,
+                customId,
+                getDeclFromDeclName,
+                isLocaleEntity,
+                setCustomId,
+                setInstanceContent: value => {
+                    setInstanceContent(value);
+                    setSavedInstanceContent(value);
+                },
+                childInstances,
+                updateLocalGitState: client?.updateLocalState,
+            })).catch((error) => {
+                console.error("Error submitting instance data:", error);
+            });
+        }
+    }, [
+        childInstances,
+        client?.updateLocalState,
+        customId,
+        entity,
+        getDeclFromDeclName,
+        id,
+        instanceContent,
+        isLocaleEntity,
+        locales,
+        onSave,
+        route,
+    ]);
     useEffect(() => {
         if (hasUnsavedChanges) {
             window.addEventListener("beforeunload", onBeforeUnload);
@@ -49,6 +89,17 @@ export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSub
             window.removeEventListener("beforeunload", onBeforeUnload);
         };
     }, [hasUnsavedChanges]);
+    useEffect(() => {
+        if (hasUnsavedChanges) {
+            window.addEventListener("keydown", saveHandler);
+        }
+        else {
+            window.removeEventListener("keydown", saveHandler);
+        }
+        return () => {
+            window.removeEventListener("keydown", saveHandler);
+        };
+    }, [hasUnsavedChanges, saveHandler]);
     useEffect(() => {
         document.title =
             (entity && titleBuilder({ locales, entity, instanceContent, instanceId: id })) ??

package/dist/src/web/routes/CreateInstance.js

@@ -11,32 +11,30 @@ const titleBuilder = ({ entity }) => {
     const entityName = entity.name;
     return "New " + toTitleCase(entityName) + " — TSONDB";
 };
-const onSubmit = async ({ locales, entity, buttonName, instanceContent, isLocaleEntity, customId, childInstances, setInstanceContent, setCustomId, route, getDeclFromDeclName, updateLocalGitState, }) => {
+const submit = async ({ locales, entity, action, instanceContent, isLocaleEntity, customId, childInstances, setInstanceContent, setCustomId, route, getDeclFromDeclName, updateLocalGitState, }) => {
     try {
-        if (buttonName) {
-            const createdInstance = await createInstanceByEntityNameAndId(locales, entity.name, {
-                childInstances,
-                entityName: entity.name,
-                content: instanceContent,
-                id: undefined,
-            }, isLocaleEntity ? customId : undefined);
-            await updateLocalGitState?.();
-            switch (buttonName) {
-                case "saveandcontinue": {
-                    route(`/entities/${entity.name}/instances/${createdInstance.instance.id}`);
-                    setInstanceContent(createdInstance.instance.content);
-                    break;
-                }
-                case "saveandaddanother": {
-                    setInstanceContent(createTypeSkeleton(getDeclFromDeclName, entity.type));
-                    setCustomId("");
-                    alert(`Instance of entity ${entity.name} created successfully with identifier ${createdInstance.instance.id}. You can add another instance now.`);
-                    break;
-                }
-                case "save": {
-                    route(`/entities/${entity.name}?created=${encodeURIComponent(createdInstance.instance.id)}`);
-                    break;
-                }
+        const createdInstance = await createInstanceByEntityNameAndId(locales, entity.name, {
+            childInstances,
+            entityName: entity.name,
+            content: instanceContent,
+            id: undefined,
+        }, isLocaleEntity ? customId : undefined);
+        await updateLocalGitState?.();
+        switch (action) {
+            case "saveandcontinue": {
+                route(`/entities/${entity.name}/instances/${createdInstance.instance.id}`);
+                setInstanceContent(createdInstance.instance.content);
+                break;
+            }
+            case "saveandaddanother": {
+                setInstanceContent(createTypeSkeleton(getDeclFromDeclName, entity.type));
+                setCustomId("");
+                alert(`Instance of entity ${entity.name} created successfully with identifier ${createdInstance.instance.id}. You can add another instance now.`);
+                break;
+            }
+            case "save": {
+                route(`/entities/${entity.name}?created=${encodeURIComponent(createdInstance.instance.id)}`);
+                break;
             }
         }
     }
@@ -46,8 +44,16 @@ const onSubmit = async ({ locales, entity, buttonName, instanceContent, isLocale
         }
     }
 };
+const onSubmit = async ({ buttonName, ...other }) => {
+    if (buttonName === "save" ||
+        buttonName === "saveandcontinue" ||
+        buttonName === "saveandaddanother") {
+        await submit({ ...other, action: buttonName });
+    }
+};
+const onSave = other => submit({ ...other, action: "saveandcontinue" });
 export const CreateInstance = () => (_jsx(InstanceRouteSkeleton, { mode: "create", buttons: [
         { label: "Save", name: "save", primary: true },
         { label: "Save and continue", name: "saveandcontinue" },
         { label: "Save and add another", name: "saveandaddanother" },
-    ], init: init, titleBuilder: titleBuilder, onSubmit: onSubmit }));
+    ], init: init, titleBuilder: titleBuilder, onSubmit: onSubmit, onSave: onSave }));

package/dist/src/web/routes/Instance.js

@@ -21,9 +21,9 @@ const titleBuilder = ({ locales, entity, instanceId, instanceContent, }) => {
     }
     return undefined;
 };
-const onSubmit = async ({ locales, entity, instanceId, instanceContent, buttonName, childInstances, route, updateLocalGitState, setInstanceContent, }) => {
+const submit = async ({ action, locales, entity, instanceId, instanceContent, childInstances, route, updateLocalGitState, setInstanceContent, }) => {
     try {
-        if (instanceId && buttonName) {
+        if (instanceId) {
             await updateInstanceByEntityNameAndId(locales, entity.name, instanceId, {
                 childInstances,
                 entityName: entity.name,
@@ -31,7 +31,7 @@ const onSubmit = async ({ locales, entity, instanceId, instanceContent, buttonNa
                 id: instanceId,
             });
             await updateLocalGitState?.();
-            switch (buttonName) {
+            switch (action) {
                 case "saveandcontinue": {
                     setInstanceContent(instanceContent);
                     break;
@@ -49,9 +49,15 @@ const onSubmit = async ({ locales, entity, instanceId, instanceContent, buttonNa
         }
     }
 };
+const onSubmit = async ({ buttonName, ...other }) => {
+    if (buttonName === "save" || buttonName === "saveandcontinue") {
+        await submit({ ...other, action: buttonName });
+    }
+};
+const onSave = other => submit({ ...other, action: "saveandcontinue" });
 export const Instance = () => {
     return (_jsx(InstanceRouteSkeleton, { mode: "edit", buttons: [
             { label: "Save", name: "save", primary: true },
             { label: "Save and continue", name: "saveandcontinue" },
-        ], init: init, titleBuilder: titleBuilder, onSubmit: onSubmit }));
+        ], init: init, titleBuilder: titleBuilder, onSubmit: onSubmit, onSave: onSave }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",