The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Move app/img into app/assets/img (#82797)
Romeo Van Snick9bdd9c585163
diff --git a/.oxfmtrc.json b/.oxfmtrc.jsonindex cdb3e84456c..8e7457b73ce 100644--- a/.oxfmtrc.json+++ b/.oxfmtrc.json@@ -29,9 +29,7 @@"embedding-sdk-package","embedding-sdk-package/**","embedding-sdk-shared",- "embedding-sdk-shared/**",- "img",- "img/**"+ "embedding-sdk-shared/**"]},{diff --git a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts b/enterprise/frontend/src/metabase-enterprise/settings/selectors.tsindex 4c4a8be06be..1b4aafa28b7 100644--- a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts@@ -1,5 +1,5 @@+import bridgeImage from "assets/img/bridge.svg?url";import noResultsSource from "assets/img/no_results.svg";-import bridgeImage from "img/bridge.svg?url";import type { IllustrationValue } from "metabase/plugins";import type { State } from "metabase/redux/store";import {diff --git a/frontend/build/shared/rspack/resolve-aliases.js b/frontend/build/shared/rspack/resolve-aliases.jsindex cca278c6bac..1bb8ea0af5d 100644--- a/frontend/build/shared/rspack/resolve-aliases.js+++ b/frontend/build/shared/rspack/resolve-aliases.js@@ -8,7 +8,6 @@ const ROOT_PATH = path.resolve(__dirname, "../../../..");const ASSETS_PATH = ROOT_PATH + "/resources/frontend_client/app/assets";const LOCALES_PATH = ROOT_PATH + "/resources/frontend_client/app/locales";const FONTS_PATH = ROOT_PATH + "/resources/frontend_client/app/fonts";-const IMAGES_PATH = ROOT_PATH + "/resources/frontend_client/app/img";const DOCS_PATH = ROOT_PATH + "/docs";const FRONTEND_BUILD_CONFIGS_PATH = ROOT_PATH + "/frontend/build";const SRC_PATH = ROOT_PATH + "/frontend/src/metabase";@@ -42,7 +41,6 @@ const RESOLVE_ALIASES = {assets: ASSETS_PATH,// Written by the `:translations` build step, which runs before the frontend one.locales: LOCALES_PATH,- img: IMAGES_PATH,fonts: FONTS_PATH,docs: DOCS_PATH,metabase: SRC_PATH,diff --git a/frontend/src/metabase/common/components/LighthouseIllustration/LighthouseIllustration.tsx b/frontend/src/metabase/common/components/LighthouseIllustration/LighthouseIllustration.tsxindex 1e4d059acea..da1807dbe94 100644--- a/frontend/src/metabase/common/components/LighthouseIllustration/LighthouseIllustration.tsx+++ b/frontend/src/metabase/common/components/LighthouseIllustration/LighthouseIllustration.tsx@@ -1,6 +1,6 @@import cx from "classnames";-import LighthouseSvg from "img/bridge.svg?component";+import LighthouseSvg from "assets/img/bridge.svg?component";import { Box } from "metabase/ui";import Styles from "./Lighthouse.module.css";diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsxindex b782f8154f8..9baecf5d11a 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx@@ -1,10 +1,10 @@import cx from "classnames";import { t } from "ttag";-import notebookModeIllustration from "img/notebook_mode_illustration.png";-import notebookModeIllustration2x from "img/[email protected]";-import sqlIllustration from "img/sql_illustration.png";-import sqlIllustration2x from "img/[email protected]";+import notebookModeIllustration from "assets/img/notebook_mode_illustration.png";+import notebookModeIllustration2x from "assets/img/[email protected]";+import sqlIllustration from "assets/img/sql_illustration.png";+import sqlIllustration2x from "assets/img/[email protected]";import { ExternalLink } from "metabase/common/components/ExternalLink";import { NoDatabasesEmptyState } from "metabase/common/components/NoDatabasesEmptyState";import CS from "metabase/css/core/index.css";diff --git a/frontend/src/metabase/plugins/oss/core.ts b/frontend/src/metabase/plugins/oss/core.tsindex 1f80c0f1a0d..818c485eea7 100644--- a/frontend/src/metabase/plugins/oss/core.ts+++ b/frontend/src/metabase/plugins/oss/core.ts@@ -2,8 +2,8 @@ import type { Action, Middleware, ThunkDispatch } from "@reduxjs/toolkit";import type { ComponentType, ReactNode } from "react";import { t } from "ttag";+import bridgeImage from "assets/img/bridge.svg?url";import noResultsSource from "assets/img/no_results.svg";-import bridgeImage from "img/bridge.svg?url";import type { AdminPathKey, State } from "metabase/redux/store";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type { Dashboard, DraftDashboardSubscription } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsxindex 4e6a295fff4..f62c9506632 100644--- a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx+++ b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx@@ -1,7 +1,7 @@import { useCallback } from "react";import { t } from "ttag";-import ModelSVG from "img/model-illustration.svg?component";+import ModelSVG from "assets/img/model-illustration.svg?component";import { ModalContent } from "metabase/common/components/ModalContent";import { useUserAcknowledgement } from "metabase/current-user";import { useDispatch } from "metabase/redux";diff --git a/resources/frontend_client/app/img/bridge.svg b/resources/frontend_client/app/assets/img/bridge.svgsimilarity index 100%rename from resources/frontend_client/app/img/bridge.svgrename to resources/frontend_client/app/assets/img/bridge.svgdiff --git a/resources/frontend_client/app/img/model-illustration.svg b/resources/frontend_client/app/assets/img/model-illustration.svgsimilarity index 100%rename from resources/frontend_client/app/img/model-illustration.svgrename to resources/frontend_client/app/assets/img/model-illustration.svgdiff --git a/resources/frontend_client/app/img/notebook_mode_illustration.png b/resources/frontend_client/app/assets/img/notebook_mode_illustration.pngsimilarity index 100%rename from resources/frontend_client/app/img/notebook_mode_illustration.pngrename to resources/frontend_client/app/assets/img/notebook_mode_illustration.pngdiff --git a/resources/frontend_client/app/img/[email protected] b/resources/frontend_client/app/assets/img/[email protected]similarity index 100%rename from resources/frontend_client/app/img/[email protected]rename to resources/frontend_client/app/assets/img/[email protected]diff --git a/resources/frontend_client/app/img/sql_illustration.png b/resources/frontend_client/app/assets/img/sql_illustration.pngsimilarity index 100%rename from resources/frontend_client/app/img/sql_illustration.pngrename to resources/frontend_client/app/assets/img/sql_illustration.pngdiff --git a/resources/frontend_client/app/img/[email protected] b/resources/frontend_client/app/assets/img/[email protected]similarity index 100%rename from resources/frontend_client/app/img/[email protected]rename to resources/frontend_client/app/assets/img/[email protected]