From 946545cfc523ec8a61a32a82382e4799eb0d80cc Mon Sep 17 00:00:00 2001 From: ismail simsek Date: Mon, 24 Jun 2024 15:06:49 +0200 Subject: [PATCH] Chore: Move LocalStorageValueProvider under @grafana/data pacakge (#89580) Rehome LocalStorageValueProvider --- .../src/utils}/LocalStorageValueProvider.tsx | 2 +- packages/grafana-data/src/utils/index.ts | 2 ++ .../src => grafana-data/src/utils}/store.ts | 0 packages/grafana-o11y-ds-frontend/src/index.ts | 2 -- .../loki/querybuilder/components/LabelBrowserModal.tsx | 3 +-- 5 files changed, 4 insertions(+), 5 deletions(-) rename packages/{grafana-o11y-ds-frontend/src/LocalStorageValueProvider => grafana-data/src/utils}/LocalStorageValueProvider.tsx (97%) rename packages/{grafana-o11y-ds-frontend/src => grafana-data/src/utils}/store.ts (100%) diff --git a/packages/grafana-o11y-ds-frontend/src/LocalStorageValueProvider/LocalStorageValueProvider.tsx b/packages/grafana-data/src/utils/LocalStorageValueProvider.tsx similarity index 97% rename from packages/grafana-o11y-ds-frontend/src/LocalStorageValueProvider/LocalStorageValueProvider.tsx rename to packages/grafana-data/src/utils/LocalStorageValueProvider.tsx index b81935d4337..f8491c8dece 100644 --- a/packages/grafana-o11y-ds-frontend/src/LocalStorageValueProvider/LocalStorageValueProvider.tsx +++ b/packages/grafana-data/src/utils/LocalStorageValueProvider.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { store } from '../store'; +import { store } from './store'; export interface Props { storageKey: string; diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts index e56ef12c010..0bece5b8160 100644 --- a/packages/grafana-data/src/utils/index.ts +++ b/packages/grafana-data/src/utils/index.ts @@ -13,6 +13,8 @@ export * from './binaryOperators'; export * from './unaryOperators'; export * from './nodeGraph'; export * from './selectUtils'; +export * from './store'; +export * from './LocalStorageValueProvider'; export { PanelOptionsEditorBuilder, FieldConfigEditorBuilder } from './OptionsUIBuilders'; export { arrayUtils }; export { getFlotPairs, getFlotPairsConstant } from './flotPairs'; diff --git a/packages/grafana-o11y-ds-frontend/src/store.ts b/packages/grafana-data/src/utils/store.ts similarity index 100% rename from packages/grafana-o11y-ds-frontend/src/store.ts rename to packages/grafana-data/src/utils/store.ts diff --git a/packages/grafana-o11y-ds-frontend/src/index.ts b/packages/grafana-o11y-ds-frontend/src/index.ts index c2f7e931a27..6cab6dbb838 100644 --- a/packages/grafana-o11y-ds-frontend/src/index.ts +++ b/packages/grafana-o11y-ds-frontend/src/index.ts @@ -13,6 +13,4 @@ export * from './TraceToLogs/TraceToLogsSettings'; export * from './TraceToMetrics/TraceToMetricsSettings'; export * from './TraceToProfiles/TraceToProfilesSettings'; export * from './utils'; -export * from './store'; -export * from './LocalStorageValueProvider/LocalStorageValueProvider'; export * from './combineResponses'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx index 90983b8c25c..c1bf43f385c 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.tsx @@ -1,8 +1,7 @@ import { css } from '@emotion/css'; import React, { useState, useEffect } from 'react'; -import { CoreApp, GrafanaTheme2, TimeRange } from '@grafana/data'; -import { LocalStorageValueProvider } from '@grafana/o11y-ds-frontend'; +import { CoreApp, GrafanaTheme2, LocalStorageValueProvider, TimeRange } from '@grafana/data'; import { reportInteraction } from '@grafana/runtime'; import { LoadingPlaceholder, Modal, useStyles2 } from '@grafana/ui';