fix(model generation): schema names and count

synmetrix · Jan 27, 2025 · d66b948 · d66b948
1 parent b5d7457
commit d66b948
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 40 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -106,7 +106,8 @@
     "row_limit": "Row Limit",
     "versions": "Versions",
     "version": "Version",
-    "default": "default",
+    "default": "Default",
+    "no_schema": "No schema",
     "find": "Find",
     "edit_teams": "Edit teams",
     "roles_and_access": "Roles and access",

diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json
@@ -106,7 +106,8 @@
     "row_limit": "Лимит строк",
     "versions": "Версии",
     "version": "Версия",
-    "default": "по умолчанию",
+    "default": "По умолчанию",
+    "no_schema": "Без схемы",
     "find": "Найти",
     "edit_teams": "Редактировать команды",
     "roles_and_access": "Роли и доступ",

diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json
@@ -107,6 +107,7 @@
     "versions": "版本",
     "version": "版本",
     "default": "默认",
+    "no_schema": "无模式",
     "find": "查找",
     "edit_teams": "编辑命令",
     "roles_and_access": "角色与访问",

diff --git a/src/components/BranchSelection/index.tsx b/src/components/BranchSelection/index.tsx
@@ -79,7 +79,7 @@ const BranchSelection: React.FC<BranchSelectionProps> = ({
           label: b.name,
           title:
             b.status === Branch_Statuses_Enum.Active
-              ? `${b.name}-${t("common:words.default")}`
+              ? `${b.name}-${t("common:words.default").toLowerCase()}`
               : b.name,
           status: b.status,
         }))}

diff --git a/src/components/DataModelGeneration/index.tsx b/src/components/DataModelGeneration/index.tsx
@@ -66,12 +66,18 @@ const DataModelGeneration: FC<DataModelGenerationProps> = ({
   const [searchValue, setSearchValue] = useState<string>("");
 
   const getCount = (val: DynamicForm, key: string) => {
-    if (val[key]) {
-      return Object.keys(val[key]).filter((k) => val?.[key]?.[k] === true)
-        .length;
-    } else {
-      return 0;
+    const keys = key.split(".");
+    let current = val;
+
+    for (const k of keys) {
+      if (current[k]) {
+        current = current[k];
+      } else {
+        return 0;
+      }
     }
+
+    return Object.keys(current).filter((k) => current[k] === true).length;
   };
 
   const onFormSubmit = (data: DynamicForm, type: string) => {
@@ -132,7 +138,8 @@ const DataModelGeneration: FC<DataModelGenerationProps> = ({
                       className={styles.collapse}
                       header={
                         <span className={styles.collapseHeader}>
-                          {s} {count > 0 && <span>({count})</span>}
+                          {s === "no_schema" ? t("common:words.no_schema") : s}
+                          {count > 0 && <span>({count})</span>}
                         </span>
                       }
                       key={s}

diff --git a/src/hooks/useOnboarding.ts b/src/hooks/useOnboarding.ts
@@ -27,7 +27,7 @@ import type {
 } from "@/types/dataSource";
 import useCheckResponse from "@/hooks/useCheckResponse";
 import { getSourceAndBranch } from "@/pages/Explore";
-import flattenTables from "@/utils/helpers/flattenTables";
+import getTables from "@/utils/helpers/getTables";
 
 interface Props {
   editId?: string;
@@ -101,7 +101,7 @@ export default ({ editId }: Props) => {
   const onDataModelGenerationSubmit = async (data: DynamicForm) => {
     let tables = { ...data } as any;
     delete tables.type;
-    tables = flattenTables(tables);
+    tables = getTables(tables);
 
     if (dataSourceSetup && !branchId) {
       message.error(`${t("no_branch")} ${dataSourceSetup.name}`);

diff --git a/src/utils/helpers/flattenTables.ts b/src/utils/helpers/flattenTables.ts
diff --git a/src/utils/helpers/getTables.ts b/src/utils/helpers/getTables.ts
@@ -1,22 +1,24 @@
 export default function getTables(obj: object, prefix: string = "") {
-  return Object.entries(obj).reduce((acc: { name: string }[], [key, value]) => {
-    let result = acc;
-    const newPath = prefix ? `${prefix}.${key}` : key;
+  return Object.entries(obj).reduce(
+    (acc: { schema: string; name: string }[], [key, value]) => {
+      let result = acc;
+      const newPath = prefix ? `${prefix}.${key}` : key;
 
-    if (value === true) {
-      const lastSlashIndex = newPath.lastIndexOf(".");
-      const formattedPath = `${newPath.slice(
-        0,
-        lastSlashIndex
-      )}.${newPath.slice(lastSlashIndex + 1)}`;
-      result.push({ name: formattedPath });
-    }
+      if (value === true) {
+        const lastDotIndex = newPath.lastIndexOf(".");
+        const schema =
+          lastDotIndex !== -1 ? newPath.slice(0, lastDotIndex) : "";
+        const name = newPath.slice(lastDotIndex + 1);
+        result.push({ schema, name });
+      }
 
-    if (typeof value === "object") {
-      const childResults = getTables(value, newPath);
-      result = acc.concat(childResults);
-    }
+      if (typeof value === "object" && value !== null) {
+        const childResults = getTables(value, newPath);
+        result = acc.concat(childResults);
+      }
 
-    return result;
-  }, []);
+      return result;
+    },
+    []
+  );
 }