From 2cb377fc0f20ea68ecdc5718f8495f1041ad3ee0 Mon Sep 17 00:00:00 2001
From: Alexander Polyankin <alexander.polyankin@metabase.com>
Date: Tue, 11 Oct 2022 17:01:56 +0300
Subject: [PATCH] Fix cljs compilation (#25876)
---
frontend/src/metabase-lib/lib/metadata/Field.ts | 2 +-
frontend/src/metabase-lib/lib/metadata/Metadata.ts | 2 +-
.../metabase-lib/lib/metadata/{utils.ts => utils/fields.ts} | 2 +-
.../{utils.unit.spec.ts => utils/fields.unit.spec.ts} | 4 ++--
frontend/src/metabase-lib/lib/queries/utils/description.js | 2 +-
frontend/src/metabase/schema.js | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename frontend/src/metabase-lib/lib/metadata/{utils.ts => utils/fields.ts} (93%)
rename frontend/src/metabase-lib/lib/metadata/{utils.unit.spec.ts => utils/fields.unit.spec.ts} (96%)
diff --git a/frontend/src/metabase-lib/lib/metadata/Field.ts b/frontend/src/metabase-lib/lib/metadata/Field.ts
index c2a100a9f26..4b6ced77392 100644
--- a/frontend/src/metabase-lib/lib/metadata/Field.ts
+++ b/frontend/src/metabase-lib/lib/metadata/Field.ts
@@ -41,7 +41,7 @@ import { FieldDimension } from "../Dimension";
import Base from "./Base";
import type Table from "./Table";
import type Metadata from "./Metadata";
-import { getUniqueFieldId } from "./utils";
+import { getUniqueFieldId } from "./utils/fields";
export const LONG_TEXT_MIN = 80;
diff --git a/frontend/src/metabase-lib/lib/metadata/Metadata.ts b/frontend/src/metabase-lib/lib/metadata/Metadata.ts
index 26c030dccf1..55b6a51278d 100644
--- a/frontend/src/metabase-lib/lib/metadata/Metadata.ts
+++ b/frontend/src/metabase-lib/lib/metadata/Metadata.ts
@@ -8,7 +8,7 @@ import type Database from "./Database";
import type Table from "./Table";
import type Schema from "./Schema";
import type Field from "./Field";
-import { getUniqueFieldId } from "./utils";
+import { getUniqueFieldId } from "./utils/fields";
/**
* @typedef { import("./metadata").DatabaseId } DatabaseId
diff --git a/frontend/src/metabase-lib/lib/metadata/utils.ts b/frontend/src/metabase-lib/lib/metadata/utils/fields.ts
similarity index 93%
rename from frontend/src/metabase-lib/lib/metadata/utils.ts
rename to frontend/src/metabase-lib/lib/metadata/utils/fields.ts
index c41c00a9001..79af47b4324 100644
--- a/frontend/src/metabase-lib/lib/metadata/utils.ts
+++ b/frontend/src/metabase-lib/lib/metadata/utils/fields.ts
@@ -1,5 +1,5 @@
import { isVirtualCardId } from "metabase/lib/saved-questions/saved-questions";
-import type Field from "./Field";
+import type Field from "../Field";
export function getUniqueFieldId(field: Field): number | string {
const { table_id } = field;
diff --git a/frontend/src/metabase-lib/lib/metadata/utils.unit.spec.ts b/frontend/src/metabase-lib/lib/metadata/utils/fields.unit.spec.ts
similarity index 96%
rename from frontend/src/metabase-lib/lib/metadata/utils.unit.spec.ts
rename to frontend/src/metabase-lib/lib/metadata/utils/fields.unit.spec.ts
index a6cf15754c6..d941771f120 100644
--- a/frontend/src/metabase-lib/lib/metadata/utils.unit.spec.ts
+++ b/frontend/src/metabase-lib/lib/metadata/utils/fields.unit.spec.ts
@@ -1,5 +1,5 @@
-import { getUniqueFieldId } from "./utils";
-import { createMockConcreteField, createMockVirtualField } from "./mocks";
+import { createMockConcreteField, createMockVirtualField } from "../mocks";
+import { getUniqueFieldId } from "./fields";
const structuredVirtualCardField = createMockConcreteField({
apiOpts: {
diff --git a/frontend/src/metabase-lib/lib/queries/utils/description.js b/frontend/src/metabase-lib/lib/queries/utils/description.js
index f0f0a0b007e..b7bd7faafd0 100644
--- a/frontend/src/metabase-lib/lib/queries/utils/description.js
+++ b/frontend/src/metabase-lib/lib/queries/utils/description.js
@@ -11,7 +11,7 @@ import { format as formatExpression } from "metabase/lib/expressions/format";
import * as AGGREGATION from "./aggregation";
import * as QUERY from "./query";
import * as FIELD_REF from "./field-ref";
-import { FilterClause, MetricClause } from "./description.styled";
+import { FilterClause, MetricClause } from "./description.styled.tsx";
// NOTE: This doesn't support every MBQL clause, e.x. joins. It should also be moved to StructuredQuery.
diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.js
index 807331f0d2c..4e937792b8b 100644
--- a/frontend/src/metabase/schema.js
+++ b/frontend/src/metabase/schema.js
@@ -3,7 +3,7 @@
import { schema } from "normalizr";
import { generateSchemaId, entityTypeForObject } from "metabase/lib/schema";
import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase/lib/saved-questions";
-import { getUniqueFieldId } from "metabase-lib/lib/metadata/utils";
+import { getUniqueFieldId } from "metabase-lib/lib/metadata/utils/fields";
export const QuestionSchema = new schema.Entity("questions");
export const BookmarkSchema = new schema.Entity("bookmarks");
--
GitLab