@gisce/react-ooui 1.0.18 → 1.1.0

package/src/actionbar/GraphActionBar.tsx

@@ -0,0 +1,67 @@
+import React, { useContext } from "react";
+import { Space } from "antd";
+import ChangeViewButton from "./ChangeViewButton";
+import {
+  ActionViewContext,
+  ActionViewContextType,
+} from "@/context/ActionViewContext";
+import ActionButton from "./ActionButton";
+import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import ButtonWithBadge from "./ButtonWithBadge";
+import { ReloadOutlined, FilterOutlined } from "@ant-design/icons";
+import { View } from "@/types";
+
+function GraphActionBar({ refreshGraph }: { refreshGraph: () => void }) {
+  const { t } = useContext(LocaleContext) as LocaleContextType;
+  const {
+    availableViews,
+    currentView,
+    setCurrentView,
+    searchParams,
+    searchVisible,
+    setSearchVisible,
+    graphIsLoading,
+    previousView,
+    setPreviousView,
+  } = useContext(ActionViewContext) as ActionViewContextType;
+
+  return (
+    <Space wrap={true}>
+      <ButtonWithBadge
+        icon={
+          <FilterOutlined
+            style={{ color: searchVisible ? "white" : undefined }}
+          />
+        }
+        tooltip={t("advanced_search")}
+        type={searchVisible ? "primary" : "default"}
+        onClick={() => {
+          setSearchVisible?.(!searchVisible);
+        }}
+        disabled={graphIsLoading}
+        badgeNumber={searchParams?.length}
+      />
+      <ActionButton
+        icon={<ReloadOutlined />}
+        tooltip={t("refresh")}
+        disabled={graphIsLoading}
+        loading={false}
+        onClick={() => {
+          refreshGraph();
+        }}
+      />
+      <ChangeViewButton
+        currentView={currentView}
+        availableViews={availableViews}
+        onChangeView={(newView: View) => {
+          setPreviousView?.(currentView);
+          setCurrentView?.(newView);
+        }}
+        disabled={false}
+        previousView={previousView}
+      />
+    </Space>
+  );
+}
+
+export default GraphActionBar;

package/src/actionbar/TreeActionBar.tsx

@@ -28,11 +28,11 @@ import {
 import ButtonWithBadge from "./ButtonWithBadge";
 import { showLogInfo } from "@/helpers/logInfoHelper";
 import SearchBar from "./SearchBar";
-import { View } from "@/views/ActionView";
 
 type Props = {
   parentContext?: any;
   treeExpandable: boolean;
+  toolbar: any;
 };
 
 function TreeActionBar(props: Props) {
@@ -49,16 +49,17 @@ function TreeActionBar(props: Props) {
     searchTreeRef,
     setCurrentId,
     setCurrentItemIndex,
-    toolbar,
     searchParams,
     searchVisible,
     setSearchVisible,
     setSearchTreeNameSearch,
     searchTreeNameSearch,
     treeIsLoading,
+    setPreviousView,
+    previousView,
   } = useContext(ActionViewContext) as ActionViewContextType;
 
-  const { parentContext = {}, treeExpandable } = props;
+  const { parentContext = {}, treeExpandable, toolbar } = props;
 
   const { t, lang } = useContext(LocaleContext) as LocaleContextType;
   const contentRootContext = useContext(
@@ -137,10 +138,6 @@ function TreeActionBar(props: Props) {
     });
   }
 
-  if (!currentView) {
-    return null;
-  }
-
   return (
     <Space wrap={true}>
       {treeExpandable ? null : (
@@ -225,10 +222,12 @@ function TreeActionBar(props: Props) {
           {separator()}
           <ChangeViewButton
             currentView={currentView}
-            availableViews={availableViews.filter(
-              (view: View) => view.type === "tree" || view.type === "form"
-            )}
-            onChangeView={setCurrentView}
+            availableViews={availableViews}
+            onChangeView={(newView) => {
+              setPreviousView?.(currentView);
+              setCurrentView?.(newView);
+            }}
+            previousView={previousView}
             disabled={treeIsLoading}
           />
         </>

package/src/context/ActionViewContext.tsx

@@ -1,4 +1,4 @@
-import { View } from "@/views/ActionView";
+import { View } from "@/types";
 import React, { useEffect, useState } from "react";
 
 export type ActionViewContextType = {
@@ -27,8 +27,8 @@ export type ActionViewContextType = {
   setFormIsLoading?: (value: boolean) => void;
   treeIsLoading?: boolean;
   setTreeIsLoading?: (value: boolean) => void;
-  toolbar?: any;
-  setToolbar?: (value: any) => void;
+  graphIsLoading?: boolean;
+  setGraphIsLoading?: (value: boolean) => void;
   attachments?: any;
   setAttachments?: (value: any) => void;
   selectedRowItems?: any[];
@@ -45,7 +45,11 @@ export type ActionViewContextType = {
   setTotalItems: (totalItems: number) => void;
   searchTreeNameSearch?: string;
   setSearchTreeNameSearch?: (searchString?: string) => void;
+  previousView?: View;
+  setPreviousView?: (view: View) => void;
   goToResourceId?: (id: number) => Promise<void>;
+  searchValues?: any;
+  setSearchValues?: (value: any) => void;
 };
 
 export const ActionViewContext =
@@ -59,12 +63,15 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
   const [formIsSaving, setFormIsSaving] = useState<boolean>(false);
   const [formHasChanges, setFormHasChanges] = useState<boolean>(false);
   const [removingItem, setRemovingItem] = useState<boolean>(false);
-  const [formIsLoading, setFormIsLoading] = useState<boolean>(false);
+  const [formIsLoading, setFormIsLoading] = useState<boolean>(true);
   const [treeIsLoading, setTreeIsLoading] = useState<boolean>(true);
   const [attachments, setAttachments] = useState<any>([]);
   const [duplicatingItem, setDuplicatingItem] = useState<boolean>(false);
   const [searchParams, setSearchParams] = useState<any[]>([]);
   const [searchVisible, setSearchVisible] = useState<boolean>(false);
+  const [graphIsLoading, setGraphIsLoading] = useState<boolean>(true);
+  const [previousView, setPreviousView] = useState<View>();
+  const [searchValues, setSearchValues] = useState<any>({});
 
   const {
     children,
@@ -82,8 +89,6 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
     currentItemIndex,
     setCurrentItemIndex,
     currentModel,
-    toolbar,
-    setToolbar,
     sorter,
     setSorter,
     totalItems,
@@ -102,6 +107,16 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
     }
   }, [results]);
 
+  useEffect(() => {
+    if (availableViews.length === 1) {
+      setPreviousView(availableViews[0]);
+    } else if (availableViews.length > 1) {
+      setPreviousView(
+        availableViews.filter((view) => view.view_id !== currentView.view_id)[0]
+      );
+    }
+  }, [availableViews]);
+
   const callOnFormSave = () => {
     (formRef.current as any)?.submitForm();
   };
@@ -134,8 +149,6 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
         setFormIsLoading,
         treeIsLoading,
         setTreeIsLoading,
-        toolbar,
-        setToolbar,
         attachments,
         setAttachments,
         selectedRowItems,
@@ -152,7 +165,13 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
         setTotalItems,
         searchTreeNameSearch,
         setSearchTreeNameSearch,
+        setGraphIsLoading,
+        graphIsLoading,
+        previousView,
+        setPreviousView,
         goToResourceId,
+        searchValues,
+        setSearchValues,
       }}
     >
       {children}

package/src/context/One2manyContext.tsx

@@ -1,9 +1,9 @@
+import { ViewType } from "@/types";
 import React, { useState } from "react";
-import { ViewModes } from "@/widgets/base/one2many/One2many";
 
 export type One2manyContextType = {
-  currentView: ViewModes;
-  setCurrentView: (view: ViewModes) => void;
+  currentView: ViewType;
+  setCurrentView: (view: ViewType) => void;
   itemIndex: number;
   setItemIndex: (value: number) => void;
   manualTriggerChange: boolean;
@@ -19,9 +19,9 @@ const One2manyProvider = ({
   initialView,
 }: {
   children: React.ReactNode;
-  initialView: ViewModes;
+  initialView: ViewType;
 }): any => {
-  const [currentView, setCurrentView] = useState<ViewModes>(initialView);
+  const [currentView, setCurrentView] = useState<ViewType>(initialView);
   const [itemIndex, setItemIndex] = useState<number>(0);
   const [manualTriggerChange, setManualTriggerChange] = useState<boolean>(
     false

package/src/context/TabManagerContext.tsx

@@ -1,6 +1,5 @@
-import { ViewType } from "@/types";
+import { InitialViewData, View, ViewType } from "@/types";
 import { ShortcutApi } from "@/ui/FavouriteButton";
-import { View } from "@/views/ActionView";
 import React, { useState } from "react";
 
 export type TabManagerContextType = {
@@ -24,7 +23,7 @@ export type TabManagerContextType = {
     views: Array<any>;
     title: string;
     target: string;
-    initialView: View;
+    initialView: InitialViewData;
     action_id: number;
     action_type: string;
     res_id?: number | boolean;

package/src/helpers/{searchFilterHelper.ts → searchHelper.ts}

@@ -5,7 +5,7 @@ const convertBooleanParamIfNeeded = (value: any) => {
   return value;
 };
 
-const getParamsForFields = (values: any, fields: any) => {
+export const getParamsForFields = (values: any, fields: any) => {
   const filteredValues = removeUndefinedFields(values);
   const groupedDateTime = groupDateTimeValuesIfNeeded(filteredValues);
   const groupedValues = ungroupDateValuesIfNeeded(groupedDateTime, fields);
@@ -88,7 +88,7 @@ const removeDateTimeSingleFields = (values: any) => {
   return newValues;
 };
 
-const groupDateTimeValuesIfNeeded = (values: any) => {
+export const groupDateTimeValuesIfNeeded = (values: any) => {
   const newValues: any = { ...removeDateTimeSingleFields(values) };
 
   const datetimeDateFields = getDatetimeDateFields(values);
@@ -148,7 +148,7 @@ const ungroupDateValuesIfNeeded = (values: any, fields: any) => {
   return newValues;
 };
 
-const removeUndefinedFields = (values: any) => {
+export const removeUndefinedFields = (values: any) => {
   const newValues = { ...values };
   Object.keys(newValues).forEach(
     (key) =>
@@ -160,8 +160,33 @@ const removeUndefinedFields = (values: any) => {
   return newValues;
 };
 
-export {
-  removeUndefinedFields,
-  groupDateTimeValuesIfNeeded,
-  getParamsForFields,
+export const getUniqueFieldsForParams = (params: any[]) => {
+  const uniqueFields: any = {};
+
+  params.forEach((param) => {
+    if (Array.isArray(param) && param[0]) {
+      uniqueFields[param[0]] = true;
+    } else {
+      uniqueFields[param] = true;
+    }
+  });
+
+  return Object.keys(uniqueFields);
+};
+
+export const mergeParams = (searchParams: any[], domainParams: any[]) => {
+  const finalParams = searchParams;
+  const uniqueParams = getUniqueFieldsForParams(searchParams);
+
+  domainParams.forEach((element) => {
+    if (Array.isArray(element) && element[0]) {
+      if (!uniqueParams.includes(element[0])) {
+        finalParams.push(element);
+      }
+    } else if (!uniqueParams.includes(element)) {
+      finalParams.push(element);
+    }
+  });
+
+  return finalParams;
 };