hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-12-14 17:02:49 +03:00
Code Issues Projects Releases Wiki Activity

frontend: rework import between ce and ee libs

Browse Source 
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8034
GitOrigin-RevId: 317eeaccea1318451cc14b4c94086cb54720dd33
This commit is contained in:
Nicolas Beaussart 2023-02-21 15:55:18 +01:00 committed by hasura-bot
parent b761add3c4
commit 7dfd2d60f9
75 changed files with 229 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/apps/console-ce/src/main.tsx
View File

@ -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(<App />, document.getElementById('content') as HTMLElement);
ReactDOM.render(
<ConsoleCeApp />,
document.getElementById('content') as HTMLElement
);

4
frontend/libs/console/legacy-ce/src/exports/app.js
View File

@ -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';

1
frontend/libs/console/legacy-ce/src/exports/appState.js
View File

@ -1 +0,0 @@
export * from '../lib/components/AppState';

2
frontend/libs/console/legacy-ce/src/exports/components.js
View File

@ -1,2 +0,0 @@
export { default as NotificationSection } from './lib/components/Main/NotificationSection';
export { default as Onboarding } from './lib/components/Common/Onboarding';

1
frontend/libs/console/legacy-ce/src/exports/constants.js
View File

@ -1 +0,0 @@
export * from '../lib/constants';

2
frontend/libs/console/legacy-ce/src/exports/index.js
View File

@ -1,2 +0,0 @@
export * from './routers';
export * from './reducers';

100
frontend/libs/console/legacy-ce/src/exports/main.js
View File

@ -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';

13
frontend/libs/console/legacy-ce/src/exports/reducers.js
View File

@ -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';

6
frontend/libs/console/legacy-ce/src/exports/routers.js
View File

@ -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';

8
frontend/libs/console/legacy-ce/src/exports/table.js
View File

@ -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 };

135
frontend/libs/console/legacy-ce/src/index.ts
View File

@ -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';

2
frontend/libs/console/legacy-ce/src/lib/components/Services/Settings/InsercureDomains/AddDomain.tsx
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/Endpoints.js
View File

@ -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;

2
frontend/libs/console/legacy-ee/src/lib/Globals.js
View File

@ -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(/\/$/, '');

2
frontend/libs/console/legacy-ee/src/lib/client.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/AppState.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Login/AdminSecretLogin.js
View File

@ -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);

2
frontend/libs/console/legacy-ee/src/lib/components/Login/Login.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Login/LoginWith.js
View File

@ -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';

11
frontend/libs/console/legacy-ee/src/lib/components/Main/Actions.js
View File

@ -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,

2
frontend/libs/console/legacy-ee/src/lib/components/Main/HeaderNavItem.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/components/Main/Main.js
View File

@ -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,

2
frontend/libs/console/legacy-ee/src/lib/components/OAuthCallback/OAuthCallback.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AddOperationsToAllowList.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowListHeader.js
View File

@ -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 }) => {

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/AllowLists.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseAllowLists.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/BrowseRows.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/CreateOperationGroup.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProject.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/AllowLists/SelectProjectAndImport.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DatePickerModal.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/DeleteOperations.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/ExportList.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Common/UsageInspectModal.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Error/BrowseRows.js
View File

@ -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,

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Metrics.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/BrowseRows.js
View File

@ -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,

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Inspect.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Operations/Operations.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealth.js
View File

@ -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 {

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/ApiHealthChart.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/Header.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Overview/index.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/AddNewOperations.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseAllOperations.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRows.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseRunTests.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTestRunPreview.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/BrowseTests.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditData.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/EditRow.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/InspectOperation.js
View File

@ -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';

6
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/PastRuns.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RegressionTests.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/ReloadOperations.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/RegressionTests/RunTests.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Filter/Filters.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/StatsPanel/Group/GroupBys.js
View File

@ -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';

6
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/BrowseRows.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Inspect.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/Modal.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/SubscriptionWorkers/SubscriptionWorkers.js
View File

@ -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 {

4
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/BrowseRows.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Inspect.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Usage/Usage.js
View File

@ -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 {

6
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/BrowseRows.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/components/Services/Metrics/Websockets/Websockets.js
View File

@ -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,

2
frontend/libs/console/legacy-ee/src/lib/constants.js
View File

@ -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,

4
frontend/libs/console/legacy-ee/src/lib/reducer.js
View File

@ -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';

8
frontend/libs/console/legacy-ee/src/lib/routes.js
View File

@ -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';

4
frontend/libs/console/legacy-ee/src/lib/utils/requestAction.js
View File

@ -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';

2
frontend/libs/console/legacy-ee/src/lib/utils/upsertToLS.js
View File

@ -1,7 +1,7 @@
import {
persistGraphiQLHeaders,
getPersistedGraphiQLHeaders,
} from '@hasura/console-oss';
} from '@hasura/console-legacy-ce';
import globals from '../Globals';

5
frontend/libs/console/legacy-ee/src/lib/utils/validateLogin.js
View File

@ -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,

16
frontend/tsconfig.base.json
View File

@ -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"