From c9b0ca3f994db99884266baeead03f084b6b1f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Gu=CC=88ell=20Segarra?= Date: Fri, 11 Nov 2022 10:16:41 +0100 Subject: [PATCH 1/2] Fix bug webclient#378 --- src/views/RootView.tsx | 6 +++++- src/widgets/views/Dashboard/Dashboard.tsx | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/RootView.tsx b/src/views/RootView.tsx index aa0bc8d3f..94a964bf5 100644 --- a/src/views/RootView.tsx +++ b/src/views/RootView.tsx @@ -437,6 +437,10 @@ function RootView(props: RootViewProps, ref: any) { }, }); } else { + const formattedInitialView = initialView && Array.isArray(initialView.id) + ? { ...initialView, id: initialView.id[0] } + : initialView; + addNewTab({ title, action: { @@ -454,7 +458,7 @@ function RootView(props: RootViewProps, ref: any) { context={{ ...rootContext, ...context }} domain={domain} setCanWeClose={registerViewCloseFn} - initialView={initialView} + initialView={formattedInitialView} res_id={res_id} formDefaultValues={values} formForcedValues={forced_values} diff --git a/src/widgets/views/Dashboard/Dashboard.tsx b/src/widgets/views/Dashboard/Dashboard.tsx index 7701680cd..663f47c22 100644 --- a/src/widgets/views/Dashboard/Dashboard.tsx +++ b/src/widgets/views/Dashboard/Dashboard.tsx @@ -308,6 +308,10 @@ function Dashboard(props: DashboardProps, ref: any) { /> ); } else if (initialView !== undefined) { + const formattedInitialView = + initialView && Array.isArray(initialView.id) + ? { ...initialView, id: initialView.id[0] } + : initialView; childContent = ( {}} - initialView={initialView} + initialView={formattedInitialView} limit={limit} /> ); From 996ce153ebf07c634eadd04d65c600c843f42195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Gu=CC=88ell=20Segarra?= Date: Fri, 11 Nov 2022 10:17:06 +0100 Subject: [PATCH 2/2] Bump react-ooui version --- npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 87be3dbe1..8f5dbc735 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@gisce/react-ooui", - "version": "1.1.11", + "version": "1.1.12", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@gisce/react-ooui", - "version": "1.1.11", + "version": "1.1.12", "dependencies": { "@ant-design/plots": "^1.0.9", "@gisce/ooui": "^0.17.9-rc.0", diff --git a/package.json b/package.json index 64beaf99e..55aeb7e45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gisce/react-ooui", - "version": "1.1.11", + "version": "1.1.12", "files": [ "dist", "src",