Skip to content

Commit 152cc61

Browse files
beaussanhasura-bot
beaussan
authored and
hasura-bot
committed
frontend: modify the code to have it work in nx
GitOrigin-RevId: e564d86de44bf81e708ca2c40bb505dec01076ce
1 parent 6849237 commit 152cc61

File tree

15 files changed

+4561
-645
lines changed

15 files changed

+4561
-645
lines changed

‎frontend/apps/console-ce-e2e/.eslintrc.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// TODO: restore it to "error". At the beginning of the Nx migration, we must keep it as is because
1313
// of the huge number of cy.wait() around the legacy tests
1414
"cypress/no-unnecessary-waiting": "warn",
15+
"@typescript-eslint/no-var-requires": "warn",
16+
"@typescript-eslint/no-empty-function": "warn",
1517

1618
"no-underscore-dangle": "off",
1719
"@typescript-eslint/no-unused-expressions": "off",

‎frontend/apps/console-ce-e2e/src/support/commands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ Cypress.Commands.add('getBySel', (selector, ...args) => {
3535
return cy.get(`[data-test=${selector}]`, ...args);
3636
});
3737

38-
// eslint-disable-next-line import/no-extraneous-dependencies
38+
/// eslint-disable-next-line import/no-extraneous-dependencies
3939
require('@cypress/snapshot').register();

‎frontend/libs/console/legacy-ce/src/exports/app.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export * from '../src/components/App/Actions';
2-
export { default as progressBarReducer } from '../src/components/App/Actions';
1+
export * from '../lib/components/App/Actions';
2+
export { default as progressBarReducer } from '../lib/components/App/Actions';
33

4-
export { default as App } from '../src/components/App/App';
4+
export { default as App } from '../lib/components/App/App';

‎frontend/libs/console/legacy-ce/src/exports/appState.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from '../src/components/AppState';
1+
export * from '../lib/components/AppState';

‎frontend/libs/console/legacy-ce/src/exports/components.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
export { default as NotificationSection } from './src/components/Main/NotificationSection';
2-
export { default as Onboarding } from './src/components/Common/Onboarding';
1+
export { default as NotificationSection } from './lib/components/Main/NotificationSection';
2+
export { default as Onboarding } from './lib/components/Common/Onboarding';

‎frontend/libs/console/legacy-ce/src/exports/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export * from '../src/constants';
1+
export * from '../lib/constants';

‎frontend/libs/console/legacy-ce/src/exports/main.js

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
const CommonScss = require('../src/components/Common/Common.module.scss');
2-
const filterQueryScss = require('../src/components/Common/FilterQuery/FilterQuery.module.scss');
3-
const tableScss = require('../src/components/Common/TableCommon/Table.module.scss');
1+
const CommonScss = require('../lib/components/Common/Common.module.scss');
2+
const filterQueryScss = require('../lib/components/Common/FilterQuery/FilterQuery.module.scss');
3+
const tableScss = require('../lib/components/Common/TableCommon/Table.module.scss');
44

5-
import * as EndpointNamedExps from '../src/Endpoints';
5+
import * as EndpointNamedExps from '../lib/Endpoints';
66

77
export {
88
persistGraphiQLHeaders,
99
getPersistedGraphiQLHeaders,
10-
} from '../src/components/Services/ApiExplorer/ApiRequest/utils';
11-
export { fetchConsoleNotifications } from '../src/components/Main/Actions';
12-
export { default as NotificationSection } from '../src/components/Main/NotificationSection';
13-
export { default as Onboarding } from '../src/components/Common/Onboarding';
10+
} from '../lib/components/Services/ApiExplorer/ApiRequest/utils';
11+
export { fetchConsoleNotifications } from '../lib/components/Main/Actions';
12+
export { default as NotificationSection } from '../lib/components/Main/NotificationSection';
13+
export { default as Onboarding } from '../lib/components/Common/Onboarding';
1414
export {
1515
Analytics,
1616
startTracing,
1717
addUserProperties,
1818
programmaticallyTraceError,
19-
} from '../src/features/Analytics';
20-
export { CloudOnboarding } from '../src/features/CloudOnboarding';
21-
export { prefetchSurveysData } from '../src/features/Surveys';
22-
export { prefetchOnboardingData } from '../src/features/CloudOnboarding/OnboardingWizard';
23-
export { default as PageNotFound } from '../src/components/Error/PageNotFound';
24-
export * from '../src/new-components/Button/';
25-
export * from '../src/new-components/Tooltip/';
26-
export { CONSOLE_ADMIN_SECRET } from '../src/components/AppState';
27-
export { default as dataHeaders } from '../src/components/Services/Data/Common/Headers';
28-
export { handleMigrationErrors } from '../src/components/Services/Data/TableModify/ModifyActions';
29-
export { loadMigrationStatus } from '../src/components/Main/Actions';
19+
} from '../lib/features/Analytics';
20+
export { CloudOnboarding } from '../lib/features/CloudOnboarding';
21+
export { prefetchSurveysData } from '../lib/features/Surveys';
22+
export { prefetchOnboardingData } from '../lib/features/CloudOnboarding/OnboardingWizard';
23+
export { default as PageNotFound } from '../lib/components/Error/PageNotFound';
24+
export * from '../lib/new-components/Button/';
25+
export * from '../lib/new-components/Tooltip/';
26+
export { CONSOLE_ADMIN_SECRET } from '../lib/components/AppState';
27+
export { default as dataHeaders } from '../lib/components/Services/Data/Common/Headers';
28+
export { handleMigrationErrors } from '../lib/components/Services/Data/TableModify/ModifyActions';
29+
export { loadMigrationStatus } from '../lib/components/Main/Actions';
3030
export {
3131
fetchSchemaList,
3232
updateSchemaInfo,
3333
UPDATE_CURRENT_SCHEMA,
3434
UPDATE_DATA_HEADERS,
3535
ADMIN_SECRET_ERROR,
36-
} from '../src/components/Services/Data/DataActions';
37-
export { default as generatedVoyagerConnector } from '../src/components/Services/VoyagerView/VoyagerView';
38-
export { default as Spinner } from '../src/components/Common/Spinner/Spinner';
36+
} from '../lib/components/Services/Data/DataActions';
37+
export { default as generatedVoyagerConnector } from '../lib/components/Services/VoyagerView/VoyagerView';
38+
export { default as Spinner } from '../lib/components/Common/Spinner/Spinner';
3939
export { CommonScss };
40-
export * from '../src/components/Services/Settings';
40+
export * from '../lib/components/Services/Settings';
4141
export {
4242
loadInconsistentObjects,
4343
exportMetadata,
44-
} from '../src/metadata/actions';
45-
import { isMetadataStatusPage } from '../src/components/Error/ErrorBoundary.tsx';
46-
import { redirectToMetadataStatus } from '../src/components/Common/utils/routesUtils.ts';
47-
import { ApiLimits } from '../src/components/Services/ApiExplorer/Security';
48-
import { IntrospectionOptions } from '../src/components/Services/ApiExplorer/Security/Introspection';
44+
} from '../lib/metadata/actions';
45+
import { isMetadataStatusPage } from '../lib/components/Error/ErrorBoundary.tsx';
46+
import { redirectToMetadataStatus } from '../lib/components/Common/utils/routesUtils.ts';
47+
import { ApiLimits } from '../lib/components/Services/ApiExplorer/Security';
48+
import { IntrospectionOptions } from '../lib/components/Services/ApiExplorer/Security/Introspection';
4949

50-
export { default as globals } from '../src/Globals';
51-
export { default as endpoints } from '../src/Endpoints';
52-
export { default as mainState } from '../src/components/Main/State';
50+
export { default as globals } from '../lib/Globals';
51+
export { default as endpoints } from '../lib/Endpoints';
52+
export { default as mainState } from '../lib/components/Main/State';
5353
export {
5454
changeRequestHeader,
5555
removeRequestHeader,
56-
} from '../src/components/Services/ApiExplorer/Actions';
56+
} from '../lib/components/Services/ApiExplorer/Actions';
5757
export { filterQueryScss, tableScss };
58-
export * from '../src/components/Common';
59-
export { loadConsoleOpts } from '../src/telemetry/Actions';
60-
export * from '../src/telemetry';
61-
export { default as Endpoints } from '../src/Endpoints';
58+
export * from '../lib/components/Common';
59+
export { loadConsoleOpts } from '../lib/telemetry/Actions';
60+
export * from '../lib/telemetry';
61+
export { default as Endpoints } from '../lib/Endpoints';
6262
export { EndpointNamedExps };
6363

64-
export { updateRequestHeaders } from '../src/components/Main/Main';
64+
export { updateRequestHeaders } from '../lib/components/Main/Main';
6565

6666
export {
6767
showErrorNotification,
6868
showSuccessNotification,
69-
} from '../src/components/Services/Common/Notification';
69+
} from '../lib/components/Services/Common/Notification';
7070

71-
export { default as CreateRestView } from '../src/components/Services/ApiExplorer/Rest/Form/';
72-
export { default as RestListView } from '../src/components/Services/ApiExplorer/Rest/List';
73-
export { default as DetailsView } from '../src/components/Services/ApiExplorer/Rest/Details';
74-
export { default as ApiContainer } from '../src/components/Services/ApiExplorer/Container';
71+
export { default as CreateRestView } from '../lib/components/Services/ApiExplorer/Rest/Form/';
72+
export { default as RestListView } from '../lib/components/Services/ApiExplorer/Rest/List';
73+
export { default as DetailsView } from '../lib/components/Services/ApiExplorer/Rest/Details';
74+
export { default as ApiContainer } from '../lib/components/Services/ApiExplorer/Container';
7575

7676
export {
7777
redirectToMetadataStatus,
@@ -81,17 +81,17 @@ export {
8181
};
8282

8383
export * from './table';
84-
export { ReactQueryProvider, reactQueryClient } from '../src/lib/reactQuery';
84+
export { ReactQueryProvider, reactQueryClient } from '../lib/lib/reactQuery';
8585

86-
export { PrometheusSettings } from '../src/features/Prometheus';
86+
export { PrometheusSettings } from '../lib/features/Prometheus';
8787

88-
export { FeatureFlags } from '../src/features/FeatureFlags';
88+
export { FeatureFlags } from '../lib/features/FeatureFlags';
8989

9090
export {
9191
isMonitoringTabSupportedEnvironment,
9292
isEnvironmentSupportMultiTenantConnectionPooling,
93-
} from '../src/utils/proConsole';
93+
} from '../lib/utils/proConsole';
9494

95-
export { AllowListDetail } from '../src/components/Services/AllowList/AllowListDetail';
95+
export { AllowListDetail } from '../lib/components/Services/AllowList/AllowListDetail';
9696

97-
export { default as generatedAdminSecretLoginConnector } from '../src/components/Login/Login';
97+
export { default as generatedAdminSecretLoginConnector } from '../lib/components/Login/Login';

‎frontend/libs/console/legacy-ce/src/exports/reducers.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
export { dataReducer } from '../src/components/Services/Data';
2-
export { default as actionsReducer } from '../src/components/Services/Actions/reducer';
3-
export { default as typesReducer } from '../src/components/Services/Types/reducer';
4-
export { eventsReducer } from '../src/components/Services/Events';
5-
export { default as apiExplorerReducer } from '../src/components/Services/ApiExplorer/Actions';
6-
export { default as telemetryReducer } from '../src/telemetry/Actions';
7-
export { default as invokeEventTriggerReducer } from '../src/components/Services/Events/EventTriggers/InvokeManualTrigger/InvokeManualTriggerAction';
8-
export { remoteSchemaReducer } from '../src/components/Services/RemoteSchema';
9-
export { modalReducer } from '../src/store/modal/modal.reducer';
1+
export { dataReducer } from '../lib/components/Services/Data';
2+
export { default as actionsReducer } from '../lib/components/Services/Actions/reducer';
3+
export { default as typesReducer } from '../lib/components/Services/Types/reducer';
4+
export { eventsReducer } from '../lib/components/Services/Events';
5+
export { default as apiExplorerReducer } from '../lib/components/Services/ApiExplorer/Actions';
6+
export { default as telemetryReducer } from '../lib/telemetry/Actions';
7+
export { default as invokeEventTriggerReducer } from '../lib/components/Services/Events/EventTriggers/InvokeManualTrigger/InvokeManualTriggerAction';
8+
export { remoteSchemaReducer } from '../lib/components/Services/RemoteSchema';
9+
export { modalReducer } from '../lib/store/modal/modal.reducer';
1010

11-
export { metadataReducer } from '../src/metadata/reducer';
12-
export { default as mainReducer } from '../src/components/Main/Actions';
13-
export { notificationsReducer } from '../src/components/Services/Common/notifications.reducer';
11+
export { metadataReducer } from '../lib/metadata/reducer';
12+
export { default as mainReducer } from '../lib/components/Main/Actions';
13+
export { notificationsReducer } from '../lib/components/Services/Common/notifications.reducer';

‎frontend/libs/console/legacy-ce/src/exports/routers.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
export { dataRouterUtils } from '../src/components/Services/Data/';
2-
export { default as getActionsRouter } from '../src/components/Services/Actions/Router';
3-
export { eventsRoutes } from '../src/components/Services/Events';
4-
export { default as generatedApiExplorer } from '../src/components/Services/ApiExplorer/ApiExplorer';
5-
export { default as generatedVoyagerConnector } from '../src/components/Services/VoyagerView/VoyagerView';
6-
export { getRemoteSchemaRouter } from '../src/components/Services/RemoteSchema';
1+
export { dataRouterUtils } from '../lib/components/Services/Data/';
2+
export { default as getActionsRouter } from '../lib/components/Services/Actions/Router';
3+
export { eventsRoutes } from '../lib/components/Services/Events';
4+
export { default as generatedApiExplorer } from '../lib/components/Services/ApiExplorer/ApiExplorer';
5+
export { default as generatedVoyagerConnector } from '../lib/components/Services/VoyagerView/VoyagerView';
6+
export { getRemoteSchemaRouter } from '../lib/components/Services/RemoteSchema';

‎frontend/libs/console/legacy-ce/src/exports/table.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import DragFoldTable from '../src/components/Common/TableCommon/DragFoldTable';
1+
import DragFoldTable from '../lib/components/Common/TableCommon/DragFoldTable';
22

3-
import Editor from '../src/components/Common/Layout/ExpandableEditor/Editor';
4-
import SearchableSelectBox from '../src/components/Common/SearchableSelect/SearchableSelect';
3+
import Editor from '../lib/components/Common/Layout/ExpandableEditor/Editor';
4+
import SearchableSelectBox from '../lib/components/Common/SearchableSelect/SearchableSelect';
55

66
export { DragFoldTable };
77

‎frontend/libs/console/legacy-ce/src/lib/features/Analytics/components/Analytics.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ export function Analytics(props: AnalyticsProps) {
9191
// Handling the <Analytics><title>XXX</title></Analytics> edge case
9292
if (
9393
type === 'htmlElement' &&
94-
// @ts-expect-error TS 4.5.2 (used in the Console at the time of writing) does not support inferring
95-
// the correct type of children. TS 4.8 (which I tested) works fine.
9694
typedChildren.type === 'title' &&
9795
isNotProduction
9896
)

‎frontend/libs/console/legacy-ee/src/lib/Globals.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { globals } from '@hasura/console-oss';
2-
import { isEmpty } from '../src/utils/validation';
2+
import { isEmpty } from './utils/validation';
33

44
const stripTrailingSlash = url => url.replace(/\/$/, '');
55

0 commit comments

Comments
 (0)