fix: refactor names

src/hooks/useFormIndicatorData.ts → src/hooks/useFormGraphData.ts

@@ -4,7 +4,7 @@ import { FormContext, FormContextType } from "@/context/FormContext";
 import { fetchAction } from "@/widgets/views/Dashboard/dashboardHelper";
 import { ShortcutApi } from "@/ui/FavouriteButton";
 
-export const useFormIndicatorData = (actionId: number) => {
+export const useFormGraphData = (actionId: number) => {
   const [error, setError] = useState<any>();
   const [loading, setLoading] = useState<boolean>(true);
   const [actionData, setActionData] = useState<any>();

src/index.ts

@@ -48,10 +48,7 @@ import { CodeEditor } from "@/widgets/custom/CodeEditor";
 import { CommentsTimelineField } from "@/widgets/custom/Comments";
 import { HTMLPreview } from "@/widgets/custom/HTMLPreview";
 import { Alert } from "@/widgets/custom/Alert";
-import {
-  DashboardGridItem,
-  DashboardGrid,
-} from "@/widgets/views/DashboardGrid";
+import { DashboardGrid } from "@/widgets/views/DashboardGrid";
 import { GraphIndicator } from "@/widgets/views/Graph/GraphIndicator";
 
 import type {
@@ -88,6 +85,7 @@ import Tab from "./views/tabs/Tab";
 import ActionView from "./views/ActionView";
 import { ErpAllFeatureKeys, ErpFeatureKeys } from "./models/erpFeature";
 import type { ErpFeaturesMap } from "./models/erpFeature";
+import { GraphCard } from "./widgets/views/Graph";
 
 export {
   Button,
@@ -154,7 +152,7 @@ export {
   FavouriteButton,
   Dashboard,
   GraphIndicator,
-  DashboardGridItem,
+  GraphCard,
   DashboardGrid,
   Tags,
   Tag,

src/stories/dashboard/DashboardGrid.stories.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { DashboardGridItem, DashboardGrid, GraphIndicator } from "../..";
+import { GraphCard, DashboardGrid, GraphIndicator } from "../..";
 
 import LocaleProvider from "../../context/LocaleContext";
 
@@ -11,10 +11,7 @@ export function Default(): React.ReactElement {
   return (
     <LocaleProvider lang="en_US">
       <DashboardGrid>
-        <DashboardGridItem
-          title="test"
-          parms={{ w: 3, h: 9, x: 0, y: 0, id: 10 }}
-        >
+        <GraphCard title="test" parms={{ w: 3, h: 9, x: 0, y: 0, id: 10 }}>
           <GraphIndicator
             model="res.partner"
             context={{}}
@@ -23,11 +20,8 @@ export function Default(): React.ReactElement {
             showPercent={true}
             // suffix={"€"}
           />
-        </DashboardGridItem>
-        <DashboardGridItem
-          title="test"
-          parms={{ w: 3, h: 9, x: 0, y: 0, id: 10 }}
-        >
+        </GraphCard>
+        <GraphCard title="test" parms={{ w: 3, h: 9, x: 0, y: 0, id: 10 }}>
           <GraphIndicator
             model="res.partner"
             context={{}}
@@ -36,7 +30,7 @@ export function Default(): React.ReactElement {
             showPercent={true}
             // suffix={"€"}
           />
-        </DashboardGridItem>
+        </GraphCard>
       </DashboardGrid>
     </LocaleProvider>
   );

src/widgets/custom/Indicator.tsx

@@ -5,19 +5,19 @@ import { WidgetProps } from "@/types";
 import Field from "@/common/Field";
 import { QuestionCircleOutlined } from "@ant-design/icons";
 import iconMapper from "@/helpers/iconMapper";
-import { useFormIndicatorData } from "@/hooks/useFormIndicatorData";
+import { useFormGraphData } from "@/hooks/useFormGraphData";
 import { CenteredSpinner } from "@/ui/CenteredSpinner";
 import { ErrorAlert } from "@/ui/ErrorAlert";
 import { Graph } from "../views/Graph/Graph";
 import ErrorBoundary from "antd/es/alert/ErrorBoundary";
 import { useFeatureIsEnabled } from "@/context/ConfigContext";
 import { ErpFeatureKeys } from "@/models/erpFeature";
 import { GraphServer } from "../views/Graph/GraphServer";
-import { DashboardGridItem } from "../views/DashboardGrid";
 import {
   TabManagerContext,
   TabManagerContextType,
 } from "@/context/TabManagerContext";
+import { GraphCard } from "../views/Graph";
 const { useToken } = theme;
 
 type IndicatorProps = WidgetProps & {
@@ -91,7 +91,7 @@ const GraphIndicatorInput = (props: IndicatorInputProps) => {
   const { actionId } = ooui;
 
   const { actionData, treeShortcut, loading, error } =
-    useFormIndicatorData(actionId);
+    useFormGraphData(actionId);
   const readForViewEnabled = useFeatureIsEnabled(
     ErpFeatureKeys.FEATURE_READFORVIEW,
   );
@@ -113,7 +113,7 @@ const GraphIndicatorInput = (props: IndicatorInputProps) => {
   const GraphComponent = readForViewEnabled ? GraphServer : Graph;
 
   return (
-    <DashboardGridItem
+    <GraphCard
       id={id}
       parms={{}}
       title={actionData.title}
@@ -127,6 +127,6 @@ const GraphIndicatorInput = (props: IndicatorInputProps) => {
         domain={domain}
         limit={limit}
       />
-    </DashboardGridItem>
+    </GraphCard>
   );
 };

src/widgets/views/Dashboard/Dashboard.tsx

@@ -11,10 +11,10 @@ import { fetchAction } from "./dashboardHelper";
 import "react-resizable/css/styles.css";
 import "react-grid-layout/css/styles.css";
 import { Graph } from "../Graph/Graph";
-import { DashboardGrid, DashboardGridItem } from "../DashboardGrid";
+import { DashboardGrid } from "../DashboardGrid";
 import ConnectionProvider from "@/ConnectionProvider";
 import { DashboardProps, FormView } from "@/types";
-import { ErpFeatureKeys, One2manyItem } from "@/index";
+import { ErpFeatureKeys, GraphCard, One2manyItem } from "@/index";
 import { readObjectValues } from "@/helpers/one2manyHelper";
 import { LoadingOutlined } from "@ant-design/icons";
 import { Alert } from "antd";
@@ -387,7 +387,7 @@ function Dashboard(props: DashboardProps, ref: any) {
         }
 
         return (
-          <DashboardGridItem
+          <GraphCard
             key={`griditem-${id}`}
             id={id}
             title={title}
@@ -396,7 +396,7 @@ function Dashboard(props: DashboardProps, ref: any) {
             openAction={openAction}
           >
             {childContent}
-          </DashboardGridItem>
+          </GraphCard>
         );
       })}
     </DashboardGrid>

src/widgets/views/DashboardGrid/index.ts

@@ -1,4 +1,2 @@
 export * from "./DashboardGrid";
-export * from "./DashboardGridItem";
 export * from "./DashboardGrid.types";
-export * from "./DashboardGridItem.types";

src/widgets/views/DashboardGrid/DashboardGridItem.tsx → src/widgets/views/Graph/GraphCard.tsx

@@ -1,12 +1,12 @@
-import { DashboardGridItemProps } from "./DashboardGridItem.types";
 import { ExportOutlined } from "@ant-design/icons";
 import { Row, Col, Typography, theme } from "antd";
 import ErrorBoundary from "antd/es/alert/ErrorBoundary";
+import { GraphCardProps } from "./GraphCard.types";
 const { useToken } = theme;
 
 const { Text } = Typography;
 
-export const DashboardGridItem = (props: DashboardGridItemProps) => {
+export const GraphCard = (props: GraphCardProps) => {
   const { title, children, action, openAction, parms } = props;
   const { token } = useToken();
 

src/widgets/views/DashboardGrid/DashboardGridItem.types.ts → src/widgets/views/Graph/GraphCard.types.ts

@@ -1,6 +1,6 @@
 import { ShortcutApi } from "@/ui/FavouriteButton";
 
-export type DashboardGridItemProps = {
+export type GraphCardProps = {
   title: string;
   id: string;
   children?: React.ReactNode;

src/widgets/views/Graph/index.ts

@@ -0,0 +1,2 @@
+export * from "./GraphCard";
+export * from "./GraphCard.types";