Merge pull request #1605 from merico-dev/1603-validation_error-when-i…

…mporting-a-dashboard-of-an-older-version 1603 validation error when importing a dashboard of an older version
merico-dev · Jan 17, 2025 · d940648 · d940648
2 parents c2bab85 + 7447e1f
commit d940648
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "14.5.0",
+  "version": "14.5.1",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/api/src/api_models/dashboard_content.ts b/api/src/api_models/dashboard_content.ts
@@ -287,14 +287,16 @@ export class DashboardContentCreateRequest {
   name: string;
 
   @IsObject()
-  @Type(() => Content)
+  // Don't validate content when creating a content,
+  // so legacy content could have a chance to migrate.
+  // @Type(() => Content)
   @ValidateNested({ each: true })
   @ApiModelProperty({
     description: 'content stored in json object format',
     required: true,
     model: 'Content',
   })
-  content: Content;
+  content: Record<string, any>;
 
   @IsOptional()
   @Type(() => Authentication)
@@ -330,14 +332,16 @@ export class DashboardContentUpdateRequest {
 
   @IsOptional()
   @IsObject()
-  @Type(() => Content)
+  // Don't validate content when updating a content,
+  // so legacy content from 'Overwrite with JSON file' could have a chance to migrate.
+  // @Type(() => Content)
   @ValidateNested({ each: true })
   @ApiModelProperty({
     description: 'content of the dashboard stored in json object format',
     required: false,
     model: 'Content',
   })
-  content?: Content;
+  content?: Record<string, any>;
 
   @IsOptional()
   @Type(() => Authentication)

diff --git a/api/src/controller/dashboard_content.controller.ts b/api/src/controller/dashboard_content.controller.ts
@@ -9,6 +9,7 @@ import { Account } from '../api_models/account';
 import { DashboardPermissionService } from '../services/dashboard_permission.service';
 import { channelBuilder, SERVER_CHANNELS, socketEmit } from '../utils/websocket';
 import {
+  Content,
   DashboardContentCreateRequest,
   DashboardContentIDRequest,
   DashboardContentListRequest,
@@ -118,7 +119,7 @@ export class DashboardContentController implements interfaces.Controller {
         auth_role_id,
         auth_permissions,
       );
-      const result = await this.dashboardContentService.create(dashboard_id, name, content, req.locale);
+      const result = await this.dashboardContentService.create(dashboard_id, name, content as Content, req.locale);
       res.json(result);
     } catch (err) {
       next(err);
@@ -193,7 +194,7 @@ export class DashboardContentController implements interfaces.Controller {
     try {
       const auth: Account | ApiKey | undefined = req.body.auth;
       const { id, name, content } = req.body as DashboardContentUpdateRequest;
-      const result = await this.dashboardContentService.update(id, name, content, req.locale, auth);
+      const result = await this.dashboardContentService.update(id, name, content as Content, req.locale, auth);
       let auth_id: string | null = null;
       let auth_type: 'APIKEY' | 'ACCOUNT' | null = null;
       if (auth) {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "14.5.0",
+  "version": "14.5.1",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "14.5.0",
+  "version": "14.5.1",
   "private": true,
   "workspaces": [
     "api",

diff --git a/settings-form/package.json b/settings-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "14.5.0",
+  "version": "14.5.1",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/website/package.json b/website/package.json
@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "14.5.0",
+  "version": "14.5.1",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"

diff --git a/website/src/frames/app/navbar/dashboard-links/action-menu/overwrite-with-json/form.tsx b/website/src/frames/app/navbar/dashboard-links/action-menu/overwrite-with-json/form.tsx
@@ -70,6 +70,7 @@ export function OverwriteWithJSONForm({
         title: 'Successful',
         message: 'Dashboard is updated',
         color: 'green',
+        loading: false,
         autoClose: true,
       });
       postSubmit();
@@ -79,6 +80,7 @@ export function OverwriteWithJSONForm({
         title: 'Failed',
         message: error.message,
         color: 'red',
+        loading: false,
         autoClose: true,
       });
     } finally {

diff --git a/website/src/frames/app/navbar/import-dashboard/form.tsx b/website/src/frames/app/navbar/import-dashboard/form.tsx
@@ -68,6 +68,7 @@ export const ImportDashboardForm = observer(({ postSubmit }: { postSubmit: () =>
         title: 'Successful',
         message: 'A new dashboard is created',
         color: 'green',
+        loading: false,
         autoClose: true,
       });
       postSubmit();
@@ -78,6 +79,7 @@ export const ImportDashboardForm = observer(({ postSubmit }: { postSubmit: () =>
         title: 'Failed',
         message: error.message,
         color: 'red',
+        loading: false,
         autoClose: true,
       });
     }