From 7dfd2d60f94abe8d1e18e135cad6b5d1c429724e Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Tue, 21 Feb 2023 15:55:18 +0100 Subject: [PATCH] frontend: rework import between ce and ee libs PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8034 GitOrigin-RevId: 317eeaccea1318451cc14b4c94086cb54720dd33 --- frontend/apps/console-ce/src/main.tsx | 7 +- .../libs/console/legacy-ce/src/exports/app.js | 4 - .../console/legacy-ce/src/exports/appState.js | 1 - .../legacy-ce/src/exports/components.js | 2 - .../legacy-ce/src/exports/constants.js | 1 - .../console/legacy-ce/src/exports/index.js | 2 - .../console/legacy-ce/src/exports/main.js | 100 ------------- .../console/legacy-ce/src/exports/reducers.js | 13 -- .../console/legacy-ce/src/exports/routers.js | 6 - .../console/legacy-ce/src/exports/table.js | 8 -- frontend/libs/console/legacy-ce/src/index.ts | 135 +++++++++++++++++- .../Settings/InsercureDomains/AddDomain.tsx | 2 +- .../console/legacy-ee/src/lib/Endpoints.js | 2 +- .../libs/console/legacy-ee/src/lib/Globals.js | 2 +- .../libs/console/legacy-ee/src/lib/client.js | 2 +- .../legacy-ee/src/lib/components/AppState.js | 2 +- .../lib/components/Login/AdminSecretLogin.js | 2 +- .../src/lib/components/Login/Login.js | 2 +- .../src/lib/components/Login/LoginWith.js | 2 +- .../src/lib/components/Main/Actions.js | 11 +- .../src/lib/components/Main/HeaderNavItem.js | 2 +- .../legacy-ee/src/lib/components/Main/Main.js | 4 +- .../components/OAuthCallback/OAuthCallback.js | 2 +- .../AllowLists/AddOperationsToAllowList.js | 2 +- .../Metrics/AllowLists/AllowListHeader.js | 2 +- .../Services/Metrics/AllowLists/AllowLists.js | 2 +- .../Metrics/AllowLists/BrowseAllowLists.js | 4 +- .../Services/Metrics/AllowLists/BrowseRows.js | 4 +- .../AllowLists/CreateOperationGroup.js | 2 +- .../Metrics/AllowLists/SelectProject.js | 2 +- .../AllowLists/SelectProjectAndImport.js | 2 +- .../Metrics/Common/DatePickerModal.js | 2 +- .../Metrics/Common/DeleteOperations.js | 2 +- .../Services/Metrics/Common/ExportList.js | 2 +- .../Metrics/Common/UsageInspectModal.js | 2 +- .../Services/Metrics/Error/BrowseRows.js | 4 +- .../components/Services/Metrics/Metrics.js | 2 +- .../Services/Metrics/Operations/BrowseRows.js | 4 +- .../Services/Metrics/Operations/Inspect.js | 2 +- .../Services/Metrics/Operations/Operations.js | 2 +- .../Services/Metrics/Overview/ApiHealth.js | 2 +- .../Metrics/Overview/ApiHealthChart.js | 2 +- .../Services/Metrics/Overview/Header.js | 2 +- .../Services/Metrics/Overview/index.js | 4 +- .../RegressionTests/AddNewOperations.js | 2 +- .../RegressionTests/BrowseAllOperations.js | 2 +- .../Metrics/RegressionTests/BrowseRows.js | 2 +- .../Metrics/RegressionTests/BrowseRunTests.js | 2 +- .../RegressionTests/BrowseTestRunPreview.js | 2 +- .../Metrics/RegressionTests/BrowseTests.js | 2 +- .../Metrics/RegressionTests/EditData.js | 4 +- .../Metrics/RegressionTests/EditRow.js | 2 +- .../RegressionTests/InspectOperation.js | 2 +- .../Metrics/RegressionTests/PastRuns.js | 6 +- .../RegressionTests/RegressionTests.js | 2 +- .../RegressionTests/ReloadOperations.js | 2 +- .../Metrics/RegressionTests/RunTests.js | 2 +- .../Metrics/StatsPanel/Filter/Filters.js | 2 +- .../Metrics/StatsPanel/Group/GroupBys.js | 2 +- .../Metrics/SubscriptionWorkers/BrowseRows.js | 6 +- .../Metrics/SubscriptionWorkers/Inspect.js | 2 +- .../Metrics/SubscriptionWorkers/Modal.js | 2 +- .../SubscriptionWorkers.js | 2 +- .../Services/Metrics/Usage/BrowseRows.js | 4 +- .../Services/Metrics/Usage/Inspect.js | 2 +- .../Services/Metrics/Usage/Usage.js | 2 +- .../Services/Metrics/Websockets/BrowseRows.js | 6 +- .../Services/Metrics/Websockets/Websockets.js | 2 +- .../console/legacy-ee/src/lib/constants.js | 2 +- .../libs/console/legacy-ee/src/lib/reducer.js | 4 +- .../libs/console/legacy-ee/src/lib/routes.js | 8 +- .../legacy-ee/src/lib/utils/requestAction.js | 4 +- .../legacy-ee/src/lib/utils/upsertToLS.js | 2 +- .../legacy-ee/src/lib/utils/validateLogin.js | 5 +- frontend/tsconfig.base.json | 16 --- 75 files changed, 229 insertions(+), 242 deletions(-) delete mode 100644 frontend/libs/console/legacy-ce/src/exports/app.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/appState.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/components.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/constants.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/index.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/main.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/reducers.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/routers.js delete mode 100644 frontend/libs/console/legacy-ce/src/exports/table.js diff --git a/frontend/apps/console-ce/src/main.tsx b/frontend/apps/console-ce/src/main.tsx index a2e0d46e2ad..7f002d8137c 100644 --- a/frontend/apps/console-ce/src/main.tsx +++ b/frontend/apps/console-ce/src/main.tsx @@ -1,6 +1,9 @@ // import './environments/environment'; import { StrictMode } from 'react'; import * as ReactDOM from 'react-dom'; -import { App } from '@hasura/console-legacy-ce'; +import { ConsoleCeApp } from '@hasura/console-legacy-ce'; -ReactDOM.render(, document.getElementById('content') as HTMLElement); +ReactDOM.render( + , + document.getElementById('content') as HTMLElement +); diff --git a/frontend/libs/console/legacy-ce/src/exports/app.js b/frontend/libs/console/legacy-ce/src/exports/app.js deleted file mode 100644 index 7b763687d24..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/app.js +++ /dev/null @@ -1,4 +0,0 @@ -export * from '../lib/components/App/Actions'; -export { default as progressBarReducer } from '../lib/components/App/Actions'; - -export { default as App } from '../lib/components/App/App'; diff --git a/frontend/libs/console/legacy-ce/src/exports/appState.js b/frontend/libs/console/legacy-ce/src/exports/appState.js deleted file mode 100644 index a623c968bbf..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/appState.js +++ /dev/null @@ -1 +0,0 @@ -export * from '../lib/components/AppState'; diff --git a/frontend/libs/console/legacy-ce/src/exports/components.js b/frontend/libs/console/legacy-ce/src/exports/components.js deleted file mode 100644 index e1281fae63e..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/components.js +++ /dev/null @@ -1,2 +0,0 @@ -export { default as NotificationSection } from './lib/components/Main/NotificationSection'; -export { default as Onboarding } from './lib/components/Common/Onboarding'; diff --git a/frontend/libs/console/legacy-ce/src/exports/constants.js b/frontend/libs/console/legacy-ce/src/exports/constants.js deleted file mode 100644 index bd1aca59798..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/constants.js +++ /dev/null @@ -1 +0,0 @@ -export * from '../lib/constants'; diff --git a/frontend/libs/console/legacy-ce/src/exports/index.js b/frontend/libs/console/legacy-ce/src/exports/index.js deleted file mode 100644 index 256e44b6964..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export * from './routers'; -export * from './reducers'; diff --git a/frontend/libs/console/legacy-ce/src/exports/main.js b/frontend/libs/console/legacy-ce/src/exports/main.js deleted file mode 100644 index 42c1f52f83a..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/main.js +++ /dev/null @@ -1,100 +0,0 @@ -const CommonScss = require('../lib/components/Common/Common.module.scss'); -const filterQueryScss = require('../lib/components/Common/FilterQuery/FilterQuery.module.scss'); -const tableScss = require('../lib/components/Common/TableCommon/Table.module.scss'); - -import * as EndpointNamedExps from '../lib/Endpoints'; - -export { - persistGraphiQLHeaders, - getPersistedGraphiQLHeaders, -} from '../lib/components/Services/ApiExplorer/ApiRequest/utils'; -export { fetchConsoleNotifications } from '../lib/components/Main/Actions'; -export { default as NotificationSection } from '../lib/components/Main/NotificationSection'; -export { default as Onboarding } from '../lib/components/Common/Onboarding'; -export { - Analytics, - startTracing, - addUserProperties, - programmaticallyTraceError, -} from '../lib/features/Analytics'; -export { CloudOnboarding } from '../lib/features/CloudOnboarding'; -export { prefetchSurveysData } from '../lib/features/Surveys'; -export { prefetchOnboardingData } from '../lib/features/CloudOnboarding/OnboardingWizard'; -export { default as PageNotFound } from '../lib/components/Error/PageNotFound'; -export * from '../lib/new-components/Button/'; -export * from '../lib/new-components/Tooltip/'; -export * from '../lib/new-components/Badge/'; -export { CONSOLE_ADMIN_SECRET } from '../lib/components/AppState'; -export { default as dataHeaders } from '../lib/components/Services/Data/Common/Headers'; -export { handleMigrationErrors } from '../lib/components/Services/Data/TableModify/ModifyActions'; -export { loadMigrationStatus } from '../lib/components/Main/Actions'; -export { - fetchSchemaList, - updateSchemaInfo, - UPDATE_CURRENT_SCHEMA, - UPDATE_DATA_HEADERS, - ADMIN_SECRET_ERROR, -} from '../lib/components/Services/Data/DataActions'; -export { default as generatedVoyagerConnector } from '../lib/components/Services/VoyagerView/VoyagerView'; -export { default as Spinner } from '../lib/components/Common/Spinner/Spinner'; -export { CommonScss }; -export * from '../lib/components/Services/Settings'; -export { - loadInconsistentObjects, - exportMetadata, -} from '../lib/metadata/actions'; -import { isMetadataStatusPage } from '../lib/components/Error/ErrorBoundary.tsx'; -import { redirectToMetadataStatus } from '../lib/components/Common/utils/routesUtils.ts'; -import { ApiLimits } from '../lib/components/Services/ApiExplorer/Security'; -import { IntrospectionOptions } from '../lib/components/Services/ApiExplorer/Security/Introspection'; - -export { default as globals } from '../lib/Globals'; -export { default as endpoints } from '../lib/Endpoints'; -export { default as mainState } from '../lib/components/Main/State'; -export { - changeRequestHeader, - removeRequestHeader, -} from '../lib/components/Services/ApiExplorer/Actions'; -export { filterQueryScss, tableScss }; -export * from '../lib/components/Common'; -export { loadConsoleOpts } from '../lib/telemetry/Actions'; -export * from '../lib/telemetry'; -export { default as Endpoints } from '../lib/Endpoints'; -export { EndpointNamedExps }; - -export { updateRequestHeaders } from '../lib/components/Main/Main'; - -export { - showErrorNotification, - showSuccessNotification, -} from '../lib/components/Services/Common/Notification'; - -export { default as CreateRestView } from '../lib/components/Services/ApiExplorer/Rest/Form/'; -export { default as RestListView } from '../lib/components/Services/ApiExplorer/Rest/List'; -export { default as DetailsView } from '../lib/components/Services/ApiExplorer/Rest/Details'; -export { default as ApiContainer } from '../lib/components/Services/ApiExplorer/Container'; - -export { - redirectToMetadataStatus, - isMetadataStatusPage, - ApiLimits, - IntrospectionOptions, -}; - -export * from './table'; -export { ReactQueryProvider, reactQueryClient } from '../lib/lib/reactQuery'; - -export { PrometheusSettings } from '../lib/features/Prometheus'; - -export { OpenTelemetryFeature } from '../lib/features/OpenTelemetry'; - -export { FeatureFlags } from '../lib/features/FeatureFlags'; - -export { - isMonitoringTabSupportedEnvironment, - isEnvironmentSupportMultiTenantConnectionPooling, -} from '../lib/utils/proConsole'; - -export { AllowListDetail } from '../lib/components/Services/AllowList/AllowListDetail'; - -export { default as generatedAdminSecretLoginConnector } from '../lib/components/Login/Login'; diff --git a/frontend/libs/console/legacy-ce/src/exports/reducers.js b/frontend/libs/console/legacy-ce/src/exports/reducers.js deleted file mode 100644 index 873173a918d..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/reducers.js +++ /dev/null @@ -1,13 +0,0 @@ -export { dataReducer } from '../lib/components/Services/Data'; -export { default as actionsReducer } from '../lib/components/Services/Actions/reducer'; -export { default as typesReducer } from '../lib/components/Services/Types/reducer'; -export { eventsReducer } from '../lib/components/Services/Events'; -export { default as apiExplorerReducer } from '../lib/components/Services/ApiExplorer/Actions'; -export { default as telemetryReducer } from '../lib/telemetry/Actions'; -export { default as invokeEventTriggerReducer } from '../lib/components/Services/Events/EventTriggers/InvokeManualTrigger/InvokeManualTriggerAction'; -export { remoteSchemaReducer } from '../lib/components/Services/RemoteSchema'; -export { modalReducer } from '../lib/store/modal/modal.reducer'; - -export { metadataReducer } from '../lib/metadata/reducer'; -export { default as mainReducer } from '../lib/components/Main/Actions'; -export { notificationsReducer } from '../lib/components/Services/Common/notifications.reducer'; diff --git a/frontend/libs/console/legacy-ce/src/exports/routers.js b/frontend/libs/console/legacy-ce/src/exports/routers.js deleted file mode 100644 index ddbfd27ed67..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/routers.js +++ /dev/null @@ -1,6 +0,0 @@ -export { dataRouterUtils } from '../lib/components/Services/Data/'; -export { default as getActionsRouter } from '../lib/components/Services/Actions/Router'; -export { eventsRoutes } from '../lib/components/Services/Events'; -export { default as generatedApiExplorer } from '../lib/components/Services/ApiExplorer/ApiExplorer'; -export { default as generatedVoyagerConnector } from '../lib/components/Services/VoyagerView/VoyagerView'; -export { getRemoteSchemaRouter } from '../lib/components/Services/RemoteSchema'; diff --git a/frontend/libs/console/legacy-ce/src/exports/table.js b/frontend/libs/console/legacy-ce/src/exports/table.js deleted file mode 100644 index d66d3a011b1..00000000000 --- a/frontend/libs/console/legacy-ce/src/exports/table.js +++ /dev/null @@ -1,8 +0,0 @@ -import DragFoldTable from '../lib/components/Common/TableCommon/DragFoldTable'; - -import Editor from '../lib/components/Common/Layout/ExpandableEditor/Editor'; -import SearchableSelectBox from '../lib/components/Common/SearchableSelect/SearchableSelect'; - -export { DragFoldTable }; - -export { Editor, SearchableSelectBox }; diff --git a/frontend/libs/console/legacy-ce/src/index.ts b/frontend/libs/console/legacy-ce/src/index.ts index fd20b6c8098..f3787e08b4b 100644 --- a/frontend/libs/console/legacy-ce/src/index.ts +++ b/frontend/libs/console/legacy-ce/src/index.ts @@ -1,5 +1,20 @@ -export const add = (a: number, b: number): number => a + b; -export { App } from './lib/client'; +import DragFoldTable from './lib/components/Common/TableCommon/DragFoldTable'; + +import Editor from './lib/components/Common/Layout/ExpandableEditor/Editor'; +import SearchableSelectBox from './lib/components/Common/SearchableSelect/SearchableSelect'; + +import { isMetadataStatusPage } from './lib/components/Error/ErrorBoundary'; +import { redirectToMetadataStatus } from './lib/components/Common/utils/routesUtils'; + +import { ApiLimits } from './lib/components/Services/ApiExplorer/Security'; +import { IntrospectionOptions } from './lib/components/Services/ApiExplorer/Security/Introspection'; + +import * as EndpointNamedExps from './lib/Endpoints'; +const CommonScss = require('./lib/components/Common/Common.module.scss'); +const filterQueryScss = require('./lib/components/Common/FilterQuery/FilterQuery.module.scss'); +const tableScss = require('./lib/components/Common/TableCommon/Table.module.scss'); + +export { App as ConsoleCeApp } from './lib/client'; export type { Metadata, @@ -9,3 +24,119 @@ export type { } from '@/features/hasura-metadata-types'; export type { ServerConfig } from './lib/hooks'; export type { MetadataResponse, SchemaResponse } from '@/features/MetadataAPI'; +export { DragFoldTable }; + +export { Editor, SearchableSelectBox }; +export { dataRouterUtils } from './lib/components/Services/Data/'; +export { default as getActionsRouter } from './lib/components/Services/Actions/Router'; +export { eventsRoutes } from './lib/components/Services/Events'; +export { default as generatedApiExplorer } from './lib/components/Services/ApiExplorer/ApiExplorer'; +export { default as generatedVoyagerConnector } from './lib/components/Services/VoyagerView/VoyagerView'; +export { getRemoteSchemaRouter } from './lib/components/Services/RemoteSchema'; +export { dataReducer } from './lib/components/Services/Data'; +export { default as actionsReducer } from './lib/components/Services/Actions/reducer'; +export { default as typesReducer } from './lib/components/Services/Types/reducer'; +export { eventsReducer } from './lib/components/Services/Events'; +export { default as apiExplorerReducer } from './lib/components/Services/ApiExplorer/Actions'; +export { default as telemetryReducer } from './lib/telemetry/Actions'; +export { default as invokeEventTriggerReducer } from './lib/components/Services/Events/EventTriggers/InvokeManualTrigger/InvokeManualTriggerAction'; +export { remoteSchemaReducer } from './lib/components/Services/RemoteSchema'; +export { modalReducer } from './lib/store/modal/modal.reducer'; + +export { metadataReducer } from './lib/metadata/reducer'; +export { default as mainReducer } from './lib/components/Main/Actions'; +export { default as notificationsReducer } from './lib/components/Services/Common/notifications.reducer'; + +export { + persistGraphiQLHeaders, + getPersistedGraphiQLHeaders, +} from './lib/components/Services/ApiExplorer/ApiRequest/utils'; +export { fetchConsoleNotifications } from './lib/components/Main/Actions'; +export { default as NotificationSection } from './lib/components/Main/NotificationSection'; +export { default as Onboarding } from './lib/components/Common/Onboarding'; +export { + Analytics, + startTracing, + addUserProperties, + programmaticallyTraceError, +} from './lib/features/Analytics'; +export { CloudOnboarding } from './lib/features/CloudOnboarding'; +export { prefetchSurveysData } from './lib/features/Surveys'; +export { prefetchOnboardingData } from './lib/features/CloudOnboarding/OnboardingWizard'; +export { default as PageNotFound } from './lib/components/Error/PageNotFound'; +export * from './lib/new-components/Button/'; +export * from './lib/new-components/Tooltip/'; +export * from './lib/new-components/Badge/'; +export { default as dataHeaders } from './lib/components/Services/Data/Common/Headers'; +export { handleMigrationErrors } from './lib/components/Services/Data/TableModify/ModifyActions'; +export { loadMigrationStatus } from './lib/components/Main/Actions'; +export { + fetchSchemaList, + updateSchemaInfo, + UPDATE_CURRENT_SCHEMA, + UPDATE_DATA_HEADERS, + ADMIN_SECRET_ERROR, +} from './lib/components/Services/Data/DataActions'; +export { default as Spinner } from './lib/components/Common/Spinner/Spinner'; +export { CommonScss }; +export * from './lib/components/Services/Settings'; +export { + loadInconsistentObjects, + exportMetadata, +} from './lib/metadata/actions'; +export { default as globals } from './lib/Globals'; +export { default as endpoints } from './lib/Endpoints'; +export { default as mainState } from './lib/components/Main/State'; +export { + changeRequestHeader, + removeRequestHeader, +} from './lib/components/Services/ApiExplorer/Actions'; +export { filterQueryScss, tableScss }; +export * from './lib/components/Common'; +export { loadConsoleOpts } from './lib/telemetry/Actions'; +export * from './lib/telemetry'; +export { default as Endpoints } from './lib/Endpoints'; +export { EndpointNamedExps }; + +export { updateRequestHeaders } from './lib/components/Main/Main'; + +export { + showErrorNotification, + showSuccessNotification, +} from './lib/components/Services/Common/Notification'; + +export { default as CreateRestView } from './lib/components/Services/ApiExplorer/Rest/Form/'; +export { default as RestListView } from './lib/components/Services/ApiExplorer/Rest/List'; +export { default as DetailsView } from './lib/components/Services/ApiExplorer/Rest/Details'; +export { default as ApiContainer } from './lib/components/Services/ApiExplorer/Container'; + +export { + redirectToMetadataStatus, + isMetadataStatusPage, + ApiLimits, + IntrospectionOptions, +}; + +export { ReactQueryProvider, reactQueryClient } from './lib/lib/reactQuery'; + +export { PrometheusSettings } from './lib/features/Prometheus'; + +export { OpenTelemetryFeature } from './lib/features/OpenTelemetry'; + +export { FeatureFlags } from './lib/features/FeatureFlags'; + +export { + isMonitoringTabSupportedEnvironment, + isEnvironmentSupportMultiTenantConnectionPooling, +} from './lib/utils/proConsole'; + +export { AllowListDetail } from './lib/components/Services/AllowList/AllowListDetail'; + +export { default as generatedAdminSecretLoginConnector } from './lib/components/Login/Login'; +export * from './lib/constants'; +export * from './lib/components/AppState'; + +export * from './lib/components/App/Actions'; +export { default as progressBarReducer } from './lib/components/App/Actions'; + +export { default as App } from './lib/components/App/App'; diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Settings/InsercureDomains/AddDomain.tsx b/frontend/libs/console/legacy-ce/src/lib/components/Services/Settings/InsercureDomains/AddDomain.tsx index 68397053b4d..30671ae790e 100644 --- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Settings/InsercureDomains/AddDomain.tsx +++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Settings/InsercureDomains/AddDomain.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { Button } from '@/new-components/Button'; -import { IconTooltip } from '@hasura/console-oss'; +import { IconTooltip } from '@/new-components/Tooltip'; import { addInsecureDomain } from '../../../../metadata/actions'; import { inputStyles } from '../constants'; diff --git a/frontend/libs/console/legacy-ee/src/lib/Endpoints.js b/frontend/libs/console/legacy-ee/src/lib/Endpoints.js index e33c2382948..88b2e566ba0 100644 --- a/frontend/libs/console/legacy-ee/src/lib/Endpoints.js +++ b/frontend/libs/console/legacy-ee/src/lib/Endpoints.js @@ -3,7 +3,7 @@ import globals from './Globals'; import { Endpoints as endpointOSS, EndpointNamedExps, -} from '@hasura/console-oss'; +} from '@hasura/console-legacy-ce'; const metricsBaseUrl = globals.metricsApiUrl; export const { globalCookiePolicy, baseUrl, hasuractlUrl } = EndpointNamedExps; diff --git a/frontend/libs/console/legacy-ee/src/lib/Globals.js b/frontend/libs/console/legacy-ee/src/lib/Globals.js index a647c16bc64..b5799ece463 100644 --- a/frontend/libs/console/legacy-ee/src/lib/Globals.js +++ b/frontend/libs/console/legacy-ee/src/lib/Globals.js @@ -1,4 +1,4 @@ -import { globals } from '@hasura/console-oss'; +import { globals } from '@hasura/console-legacy-ce'; import { isEmpty } from './utils/validation'; const stripTrailingSlash = url => url.replace(/\/$/, ''); diff --git a/frontend/libs/console/legacy-ee/src/lib/client.js b/frontend/libs/console/legacy-ee/src/lib/client.js index 032be4cb34b..c60eda597c0 100644 --- a/frontend/libs/console/legacy-ee/src/lib/client.js +++ b/frontend/libs/console/legacy-ee/src/lib/client.js @@ -4,7 +4,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { Provider } from 'react-redux'; -import { ReactQueryProvider, startTracing } from '@hasura/console-oss'; +import { ReactQueryProvider, startTracing } from '@hasura/console-legacy-ce'; import { Router, browserHistory } from 'react-router'; import { syncHistoryWithStore } from 'react-router-redux'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/AppState.js b/frontend/libs/console/legacy-ee/src/lib/components/AppState.js index e5f9bf0b621..62ddbade121 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/AppState.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/AppState.js @@ -1,4 +1,4 @@ -export * from '@hasura/console-oss/lib/appState'; +export * from '@hasura/console-legacy-ce'; const CONSOLE_PERSONAL_ACCESS_TOKEN = 'PERSONAL_ACCESS_TOKEN'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Login/AdminSecretLogin.js b/frontend/libs/console/legacy-ee/src/lib/components/Login/AdminSecretLogin.js index 8633b211339..08853f58621 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Login/AdminSecretLogin.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Login/AdminSecretLogin.js @@ -1,5 +1,5 @@ import React from 'react'; -import { generatedAdminSecretLoginConnector } from '@hasura/console-oss'; +import { generatedAdminSecretLoginConnector } from '@hasura/console-legacy-ce'; import { connect } from 'react-redux'; const AdminLogin = generatedAdminSecretLoginConnector(connect); diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Login/Login.js b/frontend/libs/console/legacy-ee/src/lib/components/Login/Login.js index 092a777d787..7f029d8212f 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Login/Login.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Login/Login.js @@ -11,7 +11,7 @@ import { UPDATE_PROJECT_ID, UPDATE_PROJECT_NAME, } from '../Main/Actions'; -import { IconTooltip } from '@hasura/console-oss'; +import { IconTooltip } from '@hasura/console-legacy-ce'; // import { FT_LOGIN_WITH_HASURA } from '../../helpers/versionUtils'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Login/LoginWith.js b/frontend/libs/console/legacy-ee/src/lib/components/Login/LoginWith.js index d4fb1e2245e..d9dbce24d83 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Login/LoginWith.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Login/LoginWith.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { initiateOAuthRequest } from './utils'; import { clearAdminSecretState } from '../AppState'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Main/Actions.js b/frontend/libs/console/legacy-ee/src/lib/components/Main/Actions.js index e4ebf661ed1..86750750513 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Main/Actions.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Main/Actions.js @@ -11,21 +11,24 @@ import { loadPATState, loadAdminSecretState, } from '../AppState'; -import { ADMIN_SECRET_ERROR, UPDATE_DATA_HEADERS } from '@hasura/console-oss'; +import { + ADMIN_SECRET_ERROR, + UPDATE_DATA_HEADERS, +} from '@hasura/console-legacy-ce'; import { getFeaturesCompatibility } from '../../helpers/versionUtils'; import { changeRequestHeader, removeRequestHeader, showErrorNotification, mainState, -} from '@hasura/console-oss'; +} from '@hasura/console-legacy-ce'; import { CONSTANT_HEADERS, SERVER_CONSOLE_MODE, CLIENT_NAME_HEADER, CLIENT_NAME_HEADER_VALUE, } from '../../constants'; -import { mainReducer } from '@hasura/console-oss/lib/hoc'; +import { mainReducer } from '@hasura/console-legacy-ce'; import { getKeyFromLS, initLS } from '../Login/localStorage'; import { parseQueryParams } from '../Login/utils'; import upsertToLS, { removeHeaderFromLS } from '../../utils/upsertToLS'; @@ -659,7 +662,7 @@ export const loadLuxProjectInfo = () => (dispatch, getState) => { is_active } } - } + } `, variables: { id: globals.hasuraCloudProjectId, diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Main/HeaderNavItem.js b/frontend/libs/console/legacy-ee/src/lib/components/Main/HeaderNavItem.js index 0e67c51f5d5..da3c0fee669 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Main/HeaderNavItem.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Main/HeaderNavItem.js @@ -2,7 +2,7 @@ import React from 'react'; import { Link } from 'react-router'; import clsx from 'clsx'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; export const linkStyle = 'flex items-stretch gap-2 text-white font-bold rounded py-2 px-3 hover:!text-white active:text-primary focus:text-primary bg-transparent hover:bg-slate-900 !no-underline cursor-pointer'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Main/Main.js b/frontend/libs/console/legacy-ee/src/lib/components/Main/Main.js index 89255dd764f..2512a7203ab 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Main/Main.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Main/Main.js @@ -27,7 +27,7 @@ import * as DropdownMenu from '@radix-ui/react-dropdown-menu'; import globals from '../../Globals'; import 'react-toggle/style.css'; -import { Spinner } from '@hasura/console-oss'; +import { Spinner } from '@hasura/console-legacy-ce'; import { Badge, NotificationSection, @@ -40,7 +40,7 @@ import { updateRequestHeaders, showErrorNotification, isMonitoringTabSupportedEnvironment, -} from '@hasura/console-oss'; +} from '@hasura/console-legacy-ce'; import { versionGT, FT_JWT_ANALYZER } from '../../helpers/versionUtils'; import { loadServerVersion, diff --git a/frontend/libs/console/legacy-ee/src/lib/components/OAuthCallback/OAuthCallback.js b/frontend/libs/console/legacy-ee/src/lib/components/OAuthCallback/OAuthCallback.js index c10240cdf2b..4b20211d03a 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/OAuthCallback/OAuthCallback.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/OAuthCallback/OAuthCallback.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { Link } from 'react-router'; import { FaExclamationCircle } from 'react-icons/fa'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AddOperationsToAllowList.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AddOperationsToAllowList.js index a4d5e678179..7c50d4494a8 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AddOperationsToAllowList.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AddOperationsToAllowList.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { useMutation } from '@apollo/react-hooks'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { addToOperationGroup } from '../Operations/graphql.queries'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowListHeader.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowListHeader.js index 203760d73ca..20f9fc08416 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowListHeader.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowListHeader.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { FaInfoCircle } from 'react-icons/fa'; const AllowListHeader = ({ title }) => { diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowLists.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowLists.js index 2ddc363ff25..96dd7f9fa53 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowLists.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowLists.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { Analytics, REDACT_EVERYTHING } from '@hasura/console-oss'; +import { Analytics, REDACT_EVERYTHING } from '@hasura/console-legacy-ce'; import { allowListOperationGroupName } from './constants'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseAllowLists.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseAllowLists.js index c8c745f87e1..75e99af60ce 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseAllowLists.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseAllowLists.js @@ -6,7 +6,7 @@ import { getAllowList } from './utils'; // import { fetchOperations } from './graphql.queries'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { createFilter } from '../Error/utils'; @@ -38,7 +38,7 @@ import { import { OPERATION_NAME_SYMBOL, relativeModulePath } from '../constants'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import inspectRow from '../images/usage.svg'; import styles from '../Metrics.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseRows.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseRows.js index 35eed385bf3..d7a1840671f 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseRows.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseRows.js @@ -8,7 +8,7 @@ import { fetchOperations, fetchRemoteOperations } from './graphql.queries'; import { allowListOperationGroupName } from './constants'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { createFilter } from '../Error/utils'; @@ -31,7 +31,7 @@ import { aliasedNames } from './constants'; import { OPERATION_NAME_SYMBOL, relativeModulePath } from '../constants'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import { checkObjectValidity } from './utils'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/CreateOperationGroup.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/CreateOperationGroup.js index b9f24e3c246..76b5b8ee974 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/CreateOperationGroup.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/CreateOperationGroup.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { useMutation } from '@apollo/react-hooks'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProject.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProject.js index dbb6d2ee122..7259a9c6658 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProject.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProject.js @@ -1,6 +1,6 @@ import React from 'react'; -import { SearchableSelectBox } from '@hasura/console-oss'; +import { SearchableSelectBox } from '@hasura/console-legacy-ce'; import { useQuery } from '@apollo/react-hooks'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProjectAndImport.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProjectAndImport.js index a21bec2b697..4b53c8183a0 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProjectAndImport.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProjectAndImport.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; -import { SearchableSelectBox } from '@hasura/console-oss'; +import { SearchableSelectBox } from '@hasura/console-legacy-ce'; import AddOperationsToAllowList from './AddOperationsToAllowList'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DatePickerModal.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DatePickerModal.js index ede4f9e2ea5..66cd8c1d0a4 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DatePickerModal.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DatePickerModal.js @@ -7,7 +7,7 @@ import { DateRangePicker } from 'react-date-range'; import 'react-date-range/dist/styles.css'; // main style file import 'react-date-range/dist/theme/default.css'; // theme css file // import moment from 'moment'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import styles from '../Metrics.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DeleteOperations.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DeleteOperations.js index 808e4eb1803..8f1dbc5bd43 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DeleteOperations.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DeleteOperations.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import styles from '../Metrics.module.scss'; import deleteIcon from '../images/delete.svg'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/ExportList.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/ExportList.js index ef11989bc3b..44552009072 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/ExportList.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/ExportList.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import styles from '../Metrics.module.scss'; import downloadList from '../images/download_bottom.svg'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/UsageInspectModal.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/UsageInspectModal.js index 35cb94a538f..d6bb5b46902 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/UsageInspectModal.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/UsageInspectModal.js @@ -2,7 +2,7 @@ import React from 'react'; import { useQuery } from '@apollo/react-hooks'; import { Link } from 'react-router'; import BootstrapModal from 'react-bootstrap/lib/Modal'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import CustomCopy from './CustomCopy'; import { transformedVals } from '../Usage/utils'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Error/BrowseRows.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Error/BrowseRows.js index f04a8bb11ae..ee06fdd812d 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Error/BrowseRows.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Error/BrowseRows.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { useQuery } from '@apollo/react-hooks'; import { Link } from 'react-router'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { getFetchErrorsWithGroupBy } from './graphql.queries'; import { @@ -20,7 +20,7 @@ import { import { SHOW_ONLY_ERRORS_SYMBOL, relativeModulePath } from '../constants'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import { defaultColumns, diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Metrics.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Metrics.js index 6126ec026ce..bd00702f73b 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Metrics.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Metrics.js @@ -1,5 +1,5 @@ import React, { useState, useMemo, useEffect } from 'react'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import LeftPanel from './LeftPanel'; import RightPanel from './RightPanel'; import globals from '../../../Globals'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/BrowseRows.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/BrowseRows.js index 40df54e5b14..9e7c330d297 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/BrowseRows.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/BrowseRows.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import { useQuery } from '@apollo/react-hooks'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { fetchOperations, getProjectConfigs } from './graphql.queries'; import Inspect from './Inspect'; @@ -15,7 +15,7 @@ import { getWhereClause, } from './utils'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import { // NO_ROLE_SYMBOL, diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Inspect.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Inspect.js index 77fd4b257ed..5eef8399eb4 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Inspect.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Inspect.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import LoadInspector from './LoadInspector'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import LoadingSpinner from '../Common/LoadingSpinner'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Operations.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Operations.js index b5b592ca14f..489573ba2f6 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Operations.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Operations.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Analytics, REDACT_EVERYTHING } from '@hasura/console-oss'; +import { Analytics, REDACT_EVERYTHING } from '@hasura/console-legacy-ce'; import { updateQsHistory, applyFilterByQueryParam } from '../utils'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealth.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealth.js index 0505fee1726..a368de00b36 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealth.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealth.js @@ -1,7 +1,7 @@ import React, { useEffect, useRef } from 'react'; import { useQuery } from 'react-apollo'; import { Col, Row } from 'react-bootstrap'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import ApiHealthChart from './ApiHealthChart'; import styles from '../MetricsV1.module.scss'; import { diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealthChart.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealthChart.js index f5dce3166f6..b17ea561946 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealthChart.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealthChart.js @@ -1,7 +1,7 @@ import React from 'react'; import { Bar } from 'react-chartjs-2'; import moment from 'moment'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import TopRequests from './TopRequests'; import styles from '../MetricsV1.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/Header.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/Header.js index b94cb862790..50ed720e55a 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/Header.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/Header.js @@ -2,7 +2,7 @@ import moment from 'moment'; import React, { useState, useEffect } from 'react'; import { FaChevronDown } from 'react-icons/fa'; import { FiRefreshCw } from 'react-icons/fi'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import styles from '../MetricsV1.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/index.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/index.js index 996ceabf676..c70e8a0c5c7 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/index.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/index.js @@ -2,9 +2,9 @@ import React, { useEffect, useState } from 'react'; import { Row } from 'react-bootstrap'; import moment from 'moment'; import { useSubscription } from 'react-apollo'; -import { Analytics, REDACT_EVERYTHING } from '@hasura/console-oss'; +import { Analytics, REDACT_EVERYTHING } from '@hasura/console-legacy-ce'; -import { loadInconsistentObjects as loadInconsistentObjectsAction } from '@hasura/console-oss'; +import { loadInconsistentObjects as loadInconsistentObjectsAction } from '@hasura/console-legacy-ce'; import { isAdmin } from '../utils'; import SourceHealth from './SourceHealth'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/AddNewOperations.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/AddNewOperations.js index 1eebc05ac1c..3ae5c9cbc8f 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/AddNewOperations.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/AddNewOperations.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { useMutation } from '@apollo/react-hooks'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { insertTestSuiteOperations } from './graphql.queries'; import styles from '../Metrics.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseAllOperations.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseAllOperations.js index 32c724e8ce2..8c273881216 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseAllOperations.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseAllOperations.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from 'react'; import { useQuery } from '@apollo/react-hooks'; import moment from 'moment'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import FilterCheckboxComponent from '../StatsPanel/Filter/FilterCheckboxComponent'; import useSelectable from '../AllowLists/useSelectable'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRows.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRows.js index 3335d73f6f1..0368ac80010 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRows.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRows.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import { useQuery } from '@apollo/react-hooks'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import FilterCheckboxComponent from '../StatsPanel/Filter/FilterCheckboxComponent'; import useSelectable from '../AllowLists/useSelectable'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRunTests.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRunTests.js index 16a9ada9a8c..a6e50512369 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRunTests.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRunTests.js @@ -1,7 +1,7 @@ import React, { Fragment } from 'react'; import { useSubscription } from '@apollo/react-hooks'; -import { tableScss } from '@hasura/console-oss'; +import { tableScss } from '@hasura/console-legacy-ce'; import { subscribeTestRunDetails } from './graphql.queries'; import styles from '../Metrics.module.scss'; import { ActionsPanel } from '../Common/ActionsPanel'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTestRunPreview.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTestRunPreview.js index 9ad27acbb99..94512e589b3 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTestRunPreview.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTestRunPreview.js @@ -1,7 +1,7 @@ import React from 'react'; import { useQuery } from '@apollo/react-hooks'; -import { tableScss } from '@hasura/console-oss'; +import { tableScss } from '@hasura/console-legacy-ce'; import { fetchRunTestPreview } from './graphql.queries'; import styles from '../Metrics.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTests.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTests.js index e7baa9569d9..1480c5d7285 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTests.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTests.js @@ -1,5 +1,5 @@ import React from 'react'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import { getTitle, getColWidth, transformMessage, StatusIcon } from './utils'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditData.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditData.js index 8aebc3f98d9..ab13d78f060 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditData.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditData.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import AceEditor from 'react-ace'; -import { Button } from '@hasura/console-oss'; -import { Tooltip } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; +import { Tooltip } from '@hasura/console-legacy-ce'; import styles from '../Metrics.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditRow.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditRow.js index b352b1b6e25..abf28b36772 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditRow.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditRow.js @@ -1,6 +1,6 @@ import React, { useState, Fragment } from 'react'; import BootstrapModal from 'react-bootstrap/lib/Modal'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { useMutation } from '@apollo/react-hooks'; import CustomCopy from '../Common/CustomCopy'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/InspectOperation.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/InspectOperation.js index 4e169f966ee..b3100ce7337 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/InspectOperation.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/InspectOperation.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { Link } from 'react-router'; import { createFilter } from '../Error/utils'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/PastRuns.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/PastRuns.js index 180a6891ee2..b46d6a44868 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/PastRuns.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/PastRuns.js @@ -1,8 +1,8 @@ import React, { useState } from 'react'; -import { Button } from '@hasura/console-oss'; -import { Tooltip } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { useQuery, useMutation } from '@apollo/react-hooks'; -import { tableScss } from '@hasura/console-oss'; +import { tableScss } from '@hasura/console-legacy-ce'; import styles from '../Metrics.module.scss'; import { ContentWithTestSuite } from './ContentWithTestSuite'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RegressionTests.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RegressionTests.js index 34ca2705b32..d788cae3c7a 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RegressionTests.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RegressionTests.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { Tab, Tabs, TabList, TabPanel } from 'react-tabs'; -import { Analytics, REDACT_EVERYTHING } from '@hasura/console-oss'; +import { Analytics, REDACT_EVERYTHING } from '@hasura/console-legacy-ce'; import { NewOperations } from './NewOperations'; import { ExistingTestsOperations } from './ExistingTestsOperations'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/ReloadOperations.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/ReloadOperations.js index f2a69b626fe..85d78e64a99 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/ReloadOperations.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/ReloadOperations.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import styles from '../Metrics.module.scss'; import syncOperationsIcon from '../images/sync.svg'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RunTests.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RunTests.js index c0ea9ba7b73..79f87c1798a 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RunTests.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RunTests.js @@ -1,7 +1,7 @@ import React, { useState, Fragment } from 'react'; import BootstrapModal from 'react-bootstrap/lib/Modal'; // import { useMutation } from '@apollo/react-hooks'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { BrowseRunTests } from './BrowseRunTests'; import { BrowseRunTestsPreview } from './BrowseTestRunPreview'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Filter/Filters.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Filter/Filters.js index dcc4784c650..dd4eea044e6 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Filter/Filters.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Filter/Filters.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import GenerateFilters from './GenerateFilters'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import FilterSection from './FilterSection'; import FilterBadge from './FilterBadge'; import filter from '../../images/filter.svg'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Group/GroupBys.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Group/GroupBys.js index 08758492d75..8d3d496bf7b 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Group/GroupBys.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Group/GroupBys.js @@ -1,6 +1,6 @@ import React from 'react'; import GenerateGroupBys from './GenerateGroupBys'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import styles from '../../Metrics.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/BrowseRows.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/BrowseRows.js index 4ef8950fb9c..f3d284b4e9f 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/BrowseRows.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/BrowseRows.js @@ -1,11 +1,11 @@ import React, { useEffect, useState } from 'react'; import moment from 'moment'; -import { Button } from '@hasura/console-oss'; -import { Tooltip } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { useQuery } from '@apollo/react-hooks'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import { arrayToPostgresArray, isAdmin } from '../utils'; import { getConfig } from './Actions'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Inspect.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Inspect.js index 3aa43544fe5..861703a238a 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Inspect.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Inspect.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import LoadInspector from './LoadInspector'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import LoadingSpinner from '../Common/LoadingSpinner'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Modal.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Modal.js index 8aed90bd4c1..c1cab23ba93 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Modal.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Modal.js @@ -1,6 +1,6 @@ import React from 'react'; import BootstrapModal from 'react-bootstrap/lib/Modal'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; // import BootstrapModalButton from 'react-bootstrap/lib/Button'; import CustomCopy from '../Common/CustomCopy'; import { REFETCH_DELAY, EXECUTION_TIME_DIVIDER_CONSTANT } from './constants'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/SubscriptionWorkers.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/SubscriptionWorkers.js index c84644e3064..b8c9b376487 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/SubscriptionWorkers.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/SubscriptionWorkers.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { Analytics, REDACT_EVERYTHING } from '@hasura/console-oss'; +import { Analytics, REDACT_EVERYTHING } from '@hasura/console-legacy-ce'; import StatsPanel from '../StatsPanel/StatsPanel'; import { diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/BrowseRows.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/BrowseRows.js index 68d8165cbf5..8702ea13895 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/BrowseRows.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/BrowseRows.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { useQuery } from '@apollo/react-hooks'; -import { Button } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; import { fetchQueryList } from './graphql.queries'; import Inspect from './Inspect'; @@ -20,7 +20,7 @@ import { getWhereClauseEx } from '../Error/utils'; import { FILTER_MAP } from './constants'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import { TIME_RANGE_SYMBOL } from '../constants'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Inspect.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Inspect.js index dc9873df268..4ea3702a77c 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Inspect.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Inspect.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import LoadInspector from './LoadInspector'; -import { Tooltip } from '@hasura/console-oss'; +import { Tooltip } from '@hasura/console-legacy-ce'; import LoadingSpinner from '../Common/LoadingSpinner'; import styles from '../Metrics.module.scss'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Usage.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Usage.js index 69d6329ce31..31cf2bb9594 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Usage.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Usage.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Analytics, REDACT_EVERYTHING } from '@hasura/console-oss'; +import { Analytics, REDACT_EVERYTHING } from '@hasura/console-legacy-ce'; import { fetchFiltersData } from '../Error/graphql.queries'; import { diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/BrowseRows.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/BrowseRows.js index cfdf1493b39..9b5eb953868 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/BrowseRows.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/BrowseRows.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { useQuery } from '@apollo/react-hooks'; -import { Button } from '@hasura/console-oss'; -import { Tooltip } from '@hasura/console-oss'; +import { Button } from '@hasura/console-legacy-ce'; +import { Tooltip } from '@hasura/console-legacy-ce'; import { Link } from 'react-router'; import { getFetchWebsocketsStatus } from './graphql.queries'; @@ -18,7 +18,7 @@ import { createFilter } from '../Error/utils'; import { relativeModulePath, WEBSOCKET_ID_SYMBOL } from '../constants'; -import { DragFoldTable, tableScss } from '@hasura/console-oss'; +import { DragFoldTable, tableScss } from '@hasura/console-legacy-ce'; import { defaultColumns, FILTER_MAP, DEFAULT_ORDER_BY } from './constants'; import moment from 'moment'; diff --git a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/Websockets.js b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/Websockets.js index 7ed0c44c496..ef9319850b5 100644 --- a/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/Websockets.js +++ b/frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/Websockets.js @@ -5,7 +5,7 @@ import { updateQsHistory, transformToTypeValueArr } from '../utils'; import { retrieveFilterData, retrieveDefaultDropdownOptions } from './utils'; import BrowseRows from './BrowseRows'; import { applyFilterByQueryParam } from '../utils'; -import { Analytics, REDACT_EVERYTHING } from '@hasura/console-oss'; +import { Analytics, REDACT_EVERYTHING } from '@hasura/console-legacy-ce'; import { TITLE_MAP, diff --git a/frontend/libs/console/legacy-ee/src/lib/constants.js b/frontend/libs/console/legacy-ee/src/lib/constants.js index de91312474a..8847fbabaf8 100644 --- a/frontend/libs/console/legacy-ee/src/lib/constants.js +++ b/frontend/libs/console/legacy-ee/src/lib/constants.js @@ -1,4 +1,4 @@ -import * as constants from '@hasura/console-oss/lib/constants'; +import * as constants from '@hasura/console-legacy-ce'; export const { SERVER_CONSOLE_MODE, diff --git a/frontend/libs/console/legacy-ee/src/lib/reducer.js b/frontend/libs/console/legacy-ee/src/lib/reducer.js index 6de5b5e98fc..6782a533fc2 100644 --- a/frontend/libs/console/legacy-ee/src/lib/reducer.js +++ b/frontend/libs/console/legacy-ee/src/lib/reducer.js @@ -13,9 +13,9 @@ import { invokeEventTriggerReducer, modalReducer, notificationsReducer, -} from '@hasura/console-oss/lib/hoc'; +} from '@hasura/console-legacy-ce'; -import { progressBarReducer } from '@hasura/console-oss/lib/app'; +import { progressBarReducer } from '@hasura/console-legacy-ce'; import mainReducer from './components/Main/Actions'; // import progressBarReducer from 'components/App/Actions'; diff --git a/frontend/libs/console/legacy-ee/src/lib/routes.js b/frontend/libs/console/legacy-ee/src/lib/routes.js index 16008ae7d9b..5042dec353f 100644 --- a/frontend/libs/console/legacy-ee/src/lib/routes.js +++ b/frontend/libs/console/legacy-ee/src/lib/routes.js @@ -13,7 +13,7 @@ import { prefetchSurveysData, prefetchOnboardingData, PageNotFound, -} from '@hasura/console-oss'; +} from '@hasura/console-legacy-ce'; import { dataRouterUtils, eventsRoutes, @@ -21,9 +21,9 @@ import { getRemoteSchemaRouter, generatedApiExplorer, generatedVoyagerConnector, -} from '@hasura/console-oss/lib/hoc'; +} from '@hasura/console-legacy-ce'; -import { requireAsyncGlobals, App } from '@hasura/console-oss/lib/app'; +import { requireAsyncGlobals, App } from '@hasura/console-legacy-ce'; import { loadMigrationStatus, @@ -45,7 +45,7 @@ import { AllowListDetail, PrometheusSettings, OpenTelemetryFeature, -} from '@hasura/console-oss'; +} from '@hasura/console-legacy-ce'; import AccessDeniedComponent from './components/AccessDenied/AccessDenied'; import { restrictedPathsMetadata } from './utils/redirectUtils'; import generatedCallbackConnector from './components/OAuthCallback/OAuthCallback'; diff --git a/frontend/libs/console/legacy-ee/src/lib/utils/requestAction.js b/frontend/libs/console/legacy-ee/src/lib/utils/requestAction.js index 8e018006aa6..e5e8c36b9d6 100644 --- a/frontend/libs/console/legacy-ee/src/lib/utils/requestAction.js +++ b/frontend/libs/console/legacy-ee/src/lib/utils/requestAction.js @@ -1,7 +1,7 @@ import fetch from 'isomorphic-fetch'; import { push } from 'react-router-redux'; import globals from '../Globals'; -import { UPDATE_DATA_HEADERS } from '@hasura/console-oss'; +import { UPDATE_DATA_HEADERS } from '@hasura/console-legacy-ce'; import { getHeaders } from '../components/Main/Actions'; import { @@ -10,7 +10,7 @@ import { FAILED_REQUEST, ERROR_REQUEST, CONNECTION_FAILED, -} from '@hasura/console-oss/lib/app'; +} from '@hasura/console-legacy-ce'; // } from 'components/App/Actions'; import { LOGIN_IN_PROGRESS, LOGIN_ERROR } from '../components/Main/Actions'; diff --git a/frontend/libs/console/legacy-ee/src/lib/utils/upsertToLS.js b/frontend/libs/console/legacy-ee/src/lib/utils/upsertToLS.js index d04595e283c..9e17a64d771 100644 --- a/frontend/libs/console/legacy-ee/src/lib/utils/upsertToLS.js +++ b/frontend/libs/console/legacy-ee/src/lib/utils/upsertToLS.js @@ -1,7 +1,7 @@ import { persistGraphiQLHeaders, getPersistedGraphiQLHeaders, -} from '@hasura/console-oss'; +} from '@hasura/console-legacy-ce'; import globals from '../Globals'; diff --git a/frontend/libs/console/legacy-ee/src/lib/utils/validateLogin.js b/frontend/libs/console/legacy-ee/src/lib/utils/validateLogin.js index 4cbc4c61e2b..668c5df9d40 100644 --- a/frontend/libs/console/legacy-ee/src/lib/utils/validateLogin.js +++ b/frontend/libs/console/legacy-ee/src/lib/utils/validateLogin.js @@ -1,4 +1,7 @@ -import { changeRequestHeader, UPDATE_DATA_HEADERS } from '@hasura/console-oss'; +import { + changeRequestHeader, + UPDATE_DATA_HEADERS, +} from '@hasura/console-legacy-ce'; import { clearAdminSecretState, clearPATState, diff --git a/frontend/tsconfig.base.json b/frontend/tsconfig.base.json index 9cb1e27dd9c..7e129b52c2f 100644 --- a/frontend/tsconfig.base.json +++ b/frontend/tsconfig.base.json @@ -18,22 +18,6 @@ "@/*": ["libs/console/legacy-ce/src/lib/*"], "@hasura/console-legacy-ce": ["libs/console/legacy-ce/src/index.ts"], "@hasura/console-legacy-ee": ["libs/console/legacy-ee/src/index.js"], - "@hasura/console-oss": ["libs/console/legacy-ce/src/exports/main.js"], - "@hasura/console-oss/lib/app": [ - "libs/console/legacy-ce/src/exports/app.js" - ], - "@hasura/console-oss/lib/appState": [ - "libs/console/legacy-ce/src/exports/appState.js" - ], - "@hasura/console-oss/lib/constants": [ - "libs/console/legacy-ce/src/exports/constants.js" - ], - "@hasura/console-oss/lib/hoc": [ - "libs/console/legacy-ce/src/exports/index.js" - ], - "@hasura/console-oss/lib/main": [ - "libs/console/legacy-ce/src/exports/main.js" - ], "@hasura/internal-plugin": ["libs/nx/internal-plugin/src/index.ts"], "storybook-addon-console-env": [ "libs/nx/storybook-addon-console-env/src/index.ts"