[#10776] OpenTelemetry > Save the changed layouts when create/edit/de…

…lete
pinpoint-apm · Oct 16, 2024 · df1fcf6 · df1fcf6
1 parent 96819f0
commit df1fcf6
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 21 deletions.
diff --git a/...n/v3/packages/ui/src/components/OpenTelemetry/dashboard/OpenTelemteryDashboardFetcher.tsx b/...n/v3/packages/ui/src/components/OpenTelemetry/dashboard/OpenTelemteryDashboardFetcher.tsx
@@ -292,9 +292,25 @@ export const OpenTelemetryDashboardFetcher = () => {
               buttonVariant={{ variant: 'destructive' }}
               onClick={() => {
                 if (currentDeletingTarget && metrics) {
-                  const targetExceptedMetrics = metrics.filter(
-                    (m) => m.id !== currentDeletingTarget.id,
-                  );
+                  const targetExceptedMetrics = metrics
+                    .filter((m) => m.id !== currentDeletingTarget.id)
+                    ?.map((m) => {
+                      const layoutByMetric = state?.layouts?.sm?.find(
+                        (layout) => layout?.i === m?.id,
+                      );
+
+                      return {
+                        ...m,
+                        layout: layoutByMetric
+                          ? {
+                              w: layoutByMetric?.w,
+                              h: layoutByMetric?.h,
+                              x: layoutByMetric?.x,
+                              y: layoutByMetric?.y,
+                            }
+                          : m?.layout,
+                      };
+                    });
                   updateMetricsWithToastMessage(
                     {
                       applicationName,
@@ -316,6 +332,7 @@ export const OpenTelemetryDashboardFetcher = () => {
         </AlertDialogContent>
       </AlertDialog>
       <MetricDefinitionSheet
+        layouts={state?.layouts}
         metric={currentEditingTarget}
         open={!!currentEditingTarget}
         onOpenChange={(open) => {

diff --git a/...ain/v3/packages/ui/src/components/OpenTelemetry/definition/MeticDefinitionFormFetcher.tsx b/...ain/v3/packages/ui/src/components/OpenTelemetry/definition/MeticDefinitionFormFetcher.tsx
@@ -87,12 +87,14 @@ const metricDefinitionFormSchemaFactory = (t: TFunction) => {
 };
 
 export interface MetricDefinitionFormFetcherProps {
+  layouts?: ReactGridLayout.Layouts;
   metric?: OtlpMetricDefUserDefined.Metric;
   onComplete?: () => void;
   onClickCancel?: () => void;
 }
 
 export const MetricDefinitionFormFetcher = ({
+  layouts,
   metric,
   onComplete,
   onClickCancel,
@@ -250,35 +252,50 @@ export const MetricDefinitionFormFetcher = ({
   };
 
   const handleSubmit = async (data: z.infer<typeof metricDefinitionFormSchema>) => {
-    if (metric?.id) {
-      // 수정
-      updateMetrics({
-        applicationName,
-        appMetricDefinitionList: [
-          ...(metrics || []).filter((m) => m.id !== metric?.id),
-          {
+    const appMetricDefinitionList = [
+      ...(metrics || []).map((m) => {
+        const layoutByMetric = layouts?.sm?.find((layout) => layout?.i === m?.id);
+
+        const layout = layoutByMetric
+          ? {
+              w: layoutByMetric?.w,
+              h: layoutByMetric?.h,
+              x: layoutByMetric?.x,
+              y: layoutByMetric?.y,
+            }
+          : m?.layout;
+
+        if (m?.id === metric?.id) {
+          return {
             ...data,
             id: metric?.id,
             applicationName,
             stack: !!data.stack,
             stackDetails: data?.stack ? data?.stackDetails : undefined,
-            layout: {
-              w: metric?.layout.w,
-              h: metric?.layout.h,
-              x: metric?.layout.x,
-              y: metric?.layout.y,
-            },
-            // TODO:
             unit: 'byte',
-          },
-        ],
+            layout,
+          };
+        } else {
+          return {
+            ...m,
+            layout,
+          };
+        }
+      }),
+    ];
+
+    if (metric?.id) {
+      // 수정
+      updateMetrics({
+        applicationName,
+        appMetricDefinitionList,
       });
     } else {
       // 신규
       updateMetrics({
         applicationName,
         appMetricDefinitionList: [
-          ...(metrics || []),
+          ...(appMetricDefinitionList || []),
           {
             ...data,
             applicationName,
@@ -287,7 +304,6 @@ export const MetricDefinitionFormFetcher = ({
             layout: {
               ...getNewWidgetLayout(metrics || []),
             },
-            // TODO:
             unit: 'byte',
           },
         ],

diff --git a/...src/main/v3/packages/ui/src/components/OpenTelemetry/definition/MetricDefinitionSheet.tsx b/...src/main/v3/packages/ui/src/components/OpenTelemetry/definition/MetricDefinitionSheet.tsx
@@ -15,11 +15,13 @@ import { PreviewChart } from '../charts';
 import { OtlpMetricDefUserDefined } from '@pinpoint-fe/constants';
 
 export interface MetricDefinitionSheetProps extends SheetPrimitive.DialogProps {
+  layouts?: ReactGridLayout.Layouts;
   metric?: OtlpMetricDefUserDefined.Metric;
   onCancel?: () => void;
 }
 
 export const MetricDefinitionSheet = ({
+  layouts,
   metric,
   onCancel,
   ...props
@@ -50,6 +52,7 @@ export const MetricDefinitionSheet = ({
         <PreviewChart />
         <Separator />
         <MetricDefinitionForm
+          layouts={layouts}
           metric={metric}
           onComplete={() => {
             onCancel?.();