Fix false positive warning in migrations UI (#2227)

tarantool · Apr 18, 2024 · 44c81ba · 44c81ba
1 parent 7eb0ad9
commit 44c81ba
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 27 deletions.
diff --git a/webui/src/models/migrations/index.ts b/webui/src/models/migrations/index.ts
@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { sample } from 'effector';
 import { createGate } from 'effector-react';
-import { TypeOf, array, object, record, string } from 'zod';
+import { TypeOf, array, object, record, string, union, unknown } from 'zod';
 
 import { app } from 'src/models';
 import { getMigrationsStates, migrationsMove, migrationsUp } from 'src/store/request/app.requests';
 
 const schema = object({
   data: object({
-    applied: record(array(string())),
+    applied: union([record(array(string())), array(unknown())]),
   }),
 });
 

diff --git a/webui/src/pages/Migrations/components/MigrationsState.tsx b/webui/src/pages/Migrations/components/MigrationsState.tsx
@@ -32,37 +32,33 @@ export const MigrationsState = () => {
   const state = useStore(migrations.$migrationsState);
   const data = useMemo(
     () =>
-      Object.keys(state?.applied ?? {}).reduce((acc: { name: string; migrations: string }[], key) => {
-        const item = state?.applied?.[key];
-        if (item) {
-          acc.push({
-            name: key,
-            migrations: item.length > 0 ? item.join(', ') : '-',
-          });
-        }
+      !state?.applied || Array.isArray(state?.applied)
+        ? []
+        : Object.keys(state.applied).reduce((acc: { name: string; migrations: string; hash: string }[], key) => {
+            const item = state?.applied?.[key];
+            if (item) {
+              acc.push({
+                name: key,
+                migrations: item.length > 0 ? item.join(', ') : '-',
+                hash: [...item].sort().join(','),
+              });
+            }
 
-        return acc;
-      }, []),
+            return acc;
+          }, []),
     [state?.applied]
   );
+
   const withWarning = useMemo(
     () =>
-      Object.keys(state?.applied ?? {}).reduce(
-        (acc, key) => {
-          if (!acc.result) {
-            const item = state?.applied?.[key];
-            if (item) {
-              const hash = [...item].sort().join(',');
-              acc.result = hash !== acc.hash;
-              acc.hash = hash;
-            }
-          }
-
+      data.reduce((acc, current, index, list) => {
+        if (acc || index <= 0) {
           return acc;
-        },
-        { result: false, hash: '' } as { result: boolean; hash: string }
-      ).result,
-    [state?.applied]
+        }
+
+        return current.hash !== list[index - 1]?.hash;
+      }, false),
+    [data]
   );
 
   return (