Merge branch 'master' into dedup-types

frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx

@@ -47,7 +47,7 @@ type PermissionsPageLayoutProps = {
   confirmBar?: ReactNode;
   diff?: PermissionsGraph;
   isDirty?: boolean;
-  onSave?: () => void;
+  onSave: () => void;
   onLoad?: () => void;
   saveError?: string;
   clearSaveError?: () => void;

frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.unit.spec.tsx

@@ -60,6 +60,9 @@ const defaultDatasetEditorProps = {
   toggleSnippetSidebar: noop,
   toggleTemplateTagsEditor: noop,
   runDirtyQuestionQuery: noop,
+  dataReferenceStack: [],
+  popDataReferenceStack: noop,
+  pushDataReferenceStack: noop,
 };
 
 const renderDatasetEditor = async (card: Card | UnsavedCard) => {

frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx

@@ -55,6 +55,7 @@ import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
 import type {
   DatasetColumn,
   Field,
+  ModelIndex,
   RawSeries,
   ResultsMetadata,
   VisualizationSettings,
@@ -72,6 +73,10 @@ import { EditorTabs } from "./EditorTabs";
 import { EDITOR_TAB_INDEXES } from "./constants";
 
 type MetadataDiff = Record<string, Partial<Field>>;
+type DataReferenceStackItem = {
+  type: string;
+  item: unknown;
+};
 
 export type DatasetEditorInnerProps = {
   question: Question;
@@ -115,6 +120,9 @@ export type DatasetEditorInnerProps = {
   toggleDataReference: () => void;
   toggleSnippetSidebar: () => void;
   forwardedRef?: React.Ref<HTMLDivElement>;
+  dataReferenceStack: DataReferenceStackItem[];
+  popDataReferenceStack: () => void;
+  pushDataReferenceStack: () => void;
 };
 
 const INITIAL_NOTEBOOK_EDITOR_HEIGHT = 500;
@@ -136,7 +144,7 @@ function mapStateToProps(state: any) {
 const mapDispatchToProps = { setDatasetEditorTab };
 
 function getSidebar(
-  props: DatasetEditorInnerProps & { modelIndexes?: unknown },
+  props: DatasetEditorInnerProps & { modelIndexes?: ModelIndex[] },
   {
     datasetEditorTab,
     isQueryError,

frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx

@@ -20,6 +20,11 @@ import type {
   TimelineEvent,
 } from "metabase-types/api";
 
+type DataReferenceStackItem = {
+  type: string;
+  item: unknown;
+};
+
 interface NativeQueryRightSidebarProps {
   question: Question;
   timelineEvents: TimelineEvent[];
@@ -51,6 +56,9 @@ interface NativeQueryRightSidebarProps {
   getEmbeddedParameterVisibility: (
     slug: string,
   ) => EmbeddingParameterVisibility;
+  dataReferenceStack: DataReferenceStackItem[];
+  popDataReferenceStack: () => void;
+  pushDataReferenceStack: () => void;
 }
 
 export const NativeQueryRightSidebar = (

package.json

@@ -463,7 +463,7 @@
     "lint-prettier": "yarn && yarn lint-prettier-pure",
     "lint-prettier-pure": "prettier --check '{frontend,enterprise/frontend,e2e}/**/*.{js,jsx,ts,tsx,css}'",
     "lint-yaml": "yamllint **/*.{yaml,yml} --ignore=node_modules/**/*.{yaml,yml}",
-    "postinstall": "yarn yarn-deduplicate --scopes @babel && patch-package",
+    "postinstall": "yarn yarn-deduplicate && patch-package",
     "precommit": "lint-staged --shell",
     "preinstall": "echo $npm_execpath | grep -q yarn || echo '\\033[0;33mSorry, npm is not supported. Please use Yarn (https://yarnpkg.com/).\\033[0m'",
     "prepare": "husky install",