Merge pull request #1257 from merico-dev/1255-download-schema-should-only-include-content

1255 download schema should only include content

Author: GerilLeto

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "10.48.2",
+  "version": "10.49.0",
   "description": "",
   "main": "index.js",
   "scripts": {

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "10.48.2",
+  "version": "10.49.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

dashboard/src/components/view/view-component/render/division.tsx

@@ -14,7 +14,7 @@ export const DivActions = observer(({ downloadScreenShot }: { downloadScreenShot
   const content = useRenderContentModelContext();
 
   const downloadSchema = () => {
-    const schema = JSON.stringify(content.json, null, 2);
+    const schema = JSON.stringify(content.contentJSON, null, 2);
     const filename = `${model.name}__${content.name}`;
     downloadJSON(filename, schema);
   };

dashboard/src/dashboard-editor/model/content/index.ts

@@ -76,6 +76,9 @@ const _ContentModel = types
         },
       };
     },
+    get contentJSON(): DashboardContentDBType['content'] {
+      return this.json.content;
+    },
     get filtersChanged() {
       const fields = 'filters.current';
       return !isEqual(getSnapshot(get(self, fields)), get(self.origin, fields));

dashboard/src/dashboard-editor/ui/header/header-menu.tsx

@@ -9,7 +9,7 @@ export const HeaderMenu = observer(() => {
   const content = useEditContentModelContext();
 
   const downloadSchema = () => {
-    const schema = JSON.stringify(content.json, null, 2);
+    const schema = JSON.stringify(content.contentJSON, null, 2);
     const filename = `${model.name}__${content.name}`;
     downloadJSON(filename, schema);
   };

dashboard/src/dashboard-render/model/content.ts

@@ -64,6 +64,9 @@ export const ContentRenderModel = types
         },
       };
     },
+    get contentJSON(): DashboardContentDBType['content'] {
+      return this.json.content;
+    },
     get payloadForSQL(): TPayloadForSQL {
       // @ts-expect-error type of getParent
       const context = getParent(self).context.current;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "10.48.2",
+  "version": "10.49.0",
   "private": true,
   "workspaces": [
     "api",

settings-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "10.48.2",
+  "version": "10.49.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

website/package.json

@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "10.48.2",
+  "version": "10.49.0",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"