Merge branch 'feat/get_toolbar' into alpha

gisce · Jan 29, 2025 · 7e121bd · 7e121bd
2 parents 5791843 + f043786
commit 7e121bd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/src/models/erpFeature.ts b/src/models/erpFeature.ts
@@ -4,6 +4,7 @@ export enum ErpFeatureKeys {
   FEATURE_OMNISEARCH = "omnisearch",
   FEATURE_READFORVIEW = "read_for_view",
   FEATURE_USERVIEWPREFS = "user_view_prefs",
+  FEATURE_GET_TOOLBAR = "get_toolbar",
   // ... add more features here
 }
 

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -218,6 +218,13 @@ type GetViewRequest = {
   context?: any;
 };
 
+type GetToolbarRequest = {
+  model: string;
+  id?: number;
+  type: ViewType;
+  context?: any;
+};
+
 type GetFieldsRequest = {
   model: string;
   fields?: string[];
@@ -383,6 +390,7 @@ type ConnectionProviderType = {
     { key }: { key: string },
     requestConfig?: any,
   ) => Promise<any>;
+  getToolbar: (options: GetViewRequest, requestConfig?: any) => Promise<any>;
 };
 
 type ViewType = "tree" | "form" | "dashboard" | "graph" | "calendar";

diff --git a/src/widgets/base/one2many/One2many.tsx b/src/widgets/base/one2many/One2many.tsx
@@ -12,6 +12,8 @@ import {
 } from "@/widgets/base/one2many/One2manyInputInfinite";
 import useDeepCompareEffect from "use-deep-compare-effect";
 import { FormContext, FormContextType } from "@/context/FormContext";
+import { useFeatureIsEnabled } from "@/context/ConfigContext";
+import { ErpFeatureKeys } from "@/models/erpFeature";
 
 const MIN_ITEMS_TO_USE_INFINITE = 30;
 
@@ -35,18 +37,24 @@ export const One2many = (props: Props) => {
     fetchData();
   }, [ooui]);
 
-  const getViewData = async (type: ViewType) => {
-    const getViewPromise = ConnectionProvider.getHandler().getView({
-      model: relation,
-      type,
-      context: { ...getContext?.(), ...context },
-    });
+  const getToolbarEnabled = useFeatureIsEnabled(
+    ErpFeatureKeys.FEATURE_GET_TOOLBAR,
+  );
 
+  const getViewData = async (type: ViewType) => {
     if (oouiViews && oouiViews[type]) {
       const view = oouiViews[type];
-      if (!view.toolbar && (type === "form" || type === "tree")) {
-        const viewWithToolbar: TreeView | FormView = await getViewPromise;
-        return { ...view, toolbar: viewWithToolbar.toolbar };
+      if (
+        getToolbarEnabled &&
+        !view.toolbar &&
+        (type === "form" || type === "tree")
+      ) {
+        const toolbar = await ConnectionProvider.getHandler().getToolbar({
+          model: relation,
+          type,
+          context: { ...getContext?.(), ...context },
+        });
+        return { ...view, toolbar };
       }
       return view;
     }