From 024552c8648d62e55706dda991e08a4efafdf219 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Mon, 22 Sep 2025 21:20:41 -0600 Subject: [PATCH] drop query param on save to server --- .../metrics/updateMetricQueryRequests.ts | 8 ++- .../MetricViewFile/MetricViewFile.tsx | 57 ------------------- .../MetricController/MetricViewFile/index.ts | 1 - 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 apps/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx delete mode 100644 apps/web/src/controllers/MetricController/MetricViewFile/index.ts diff --git a/apps/web/src/api/buster_rest/metrics/updateMetricQueryRequests.ts b/apps/web/src/api/buster_rest/metrics/updateMetricQueryRequests.ts index 7d8711bce..c46e598b4 100644 --- a/apps/web/src/api/buster_rest/metrics/updateMetricQueryRequests.ts +++ b/apps/web/src/api/buster_rest/metrics/updateMetricQueryRequests.ts @@ -1,4 +1,5 @@ import { type QueryClient, useMutation, useQueryClient } from '@tanstack/react-query'; +import { useNavigate } from '@tanstack/react-router'; import last from 'lodash/last'; import { create } from 'mutative'; import type { BusterCollection } from '@/api/asset_interfaces/collection'; @@ -27,6 +28,7 @@ import { export const useSaveMetric = (params?: { updateOnSave?: boolean }) => { const updateOnSave = params?.updateOnSave || false; const queryClient = useQueryClient(); + const navigate = useNavigate(); return useMutation({ mutationFn: updateMetric, @@ -60,6 +62,11 @@ export const useSaveMetric = (params?: { updateOnSave?: boolean }) => { if (updateOnSave && data) { setMetricQueryData(queryClient, newMetric); } + navigate({ + to: '.', + ignoreBlocker: true, + search: (prev) => ({ ...prev, metric_version_number: undefined }), + }); }, }); }; @@ -361,7 +368,6 @@ export const useUpdateMetric = (params: { newMetricPartial: Omit, 'status'> & { id: string } ) => { const { newMetric, prevMetric } = combineAndUpdateMetric(newMetricPartial); - console.log('newMetric', newMetric); if (newMetric && prevMetric && saveToServer) { return await saveMetricToServer(newMetric, prevMetric); diff --git a/apps/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx b/apps/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx deleted file mode 100644 index da88fd1ec..000000000 --- a/apps/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import React from 'react'; -import { useGetMetric, useUpdateMetric } from '@/api/buster_rest/metrics'; -import { EditFileContainer } from '@/components/features/files/EditFileContainer'; -import { useBusterNotifications } from '@/context/BusterNotifications'; -import { useIsMetricReadOnly } from '@/context/Metrics/useIsMetricReadOnly'; -import { useMemoizedFn } from '@/hooks/useMemoizedFn'; - -export const MetricViewFile: React.FC<{ metricId: string }> = React.memo(({ metricId }) => { - const { data: metric } = useGetMetric( - { id: metricId }, - { - select: ({ file, file_name }) => ({ - file, - file_name, - }), - } - ); - const { openSuccessMessage } = useBusterNotifications(); - const { - mutateAsync: updateMetric, - isPending: isUpdatingMetric, - error: updateMetricError, - } = useUpdateMetric({ - updateOnSave: true, - saveToServer: true, - updateVersion: false, - }); - - const { isReadOnly } = useIsMetricReadOnly({ - metricId, - }); - - const updateMetricErrorMessage = updateMetricError?.message; - - const { file, file_name } = metric || {}; - - const onSaveFile = useMemoizedFn(async (file: string) => { - await updateMetric({ - file, - id: metricId, - }); - openSuccessMessage(`${file_name} saved`); - }); - - return ( - - ); -}); - -MetricViewFile.displayName = 'MetricViewFile'; diff --git a/apps/web/src/controllers/MetricController/MetricViewFile/index.ts b/apps/web/src/controllers/MetricController/MetricViewFile/index.ts deleted file mode 100644 index 33af41016..000000000 --- a/apps/web/src/controllers/MetricController/MetricViewFile/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './MetricViewFile';