Skip to content

Commit d673d10

Browse files
Merge pull request #15723 from logonoff/CONSOLE-4858-s2e20-drug-testing
CONSOLE-4858: Fix 27 cycles
2 parents f4d51e9 + 33ddf26 commit d673d10

File tree

38 files changed

+912
-908
lines changed

38 files changed

+912
-908
lines changed

frontend/packages/console-app/src/components/nodes/NodeDetailsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { ResourceEventStream } from '@console/internal/components/events';
33
import { DetailsPage } from '@console/internal/components/factory';
4-
import { PodsPage } from '@console/internal/components/pod';
4+
import { PodsPage } from '@console/internal/components/pod-list';
55
import { navFactory } from '@console/internal/components/utils/horizontal-nav';
66
import type { PageComponentProps } from '@console/internal/components/utils/horizontal-nav';
77
import { K8sModel, NodeKind, referenceForModel } from '@console/internal/module/k8s';

frontend/packages/console-app/src/plugin.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import '@console/internal/i18n.js';
2-
import '@console/shared/src/index.ts'; // this import is load bearing in development?!?!
31
import { GuidedTour, Plugin } from '@console/plugin-sdk';
42
import { getGuidedTour } from './components/guided-tour';
53

frontend/packages/console-shared/src/components/dashboard/utilization-card/prometheus-hook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
} from '@console/internal/actions/dashboards';
88
import { getInstantVectorStats } from '@console/internal/components/graphs/utils';
99
import { Humanize, HumanizeResult } from '@console/internal/components/utils/types';
10-
import { RESULTS_TYPE } from '@console/internal/reducers/dashboards';
10+
import { RESULTS_TYPE } from '@console/internal/reducers/dashboard-results';
1111
import { RootState } from '@console/internal/redux';
1212

1313
/** @deprecated use usePrometheusPoll() instead */

frontend/packages/console-shared/src/components/pod/PodsOverview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Alert, AlertActionLink, Grid, GridItem, List, ListItem } from '@pattern
33
import * as _ from 'lodash';
44
import { useTranslation } from 'react-i18next';
55
import { Link } from 'react-router-dom-v5-compat';
6-
import { PodStatus } from '@console/internal/components/pod';
6+
import { PodStatus } from '@console/internal/components/pod-list';
77
import { PodTraffic } from '@console/internal/components/pod-traffic';
88
import { SidebarSectionHeading } from '@console/internal/components/utils/headings';
99
import { useK8sWatchResources } from '@console/internal/components/utils/k8s-watch-hook';

frontend/packages/console-shared/src/hooks/useDashboardResources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
watchURL,
1212
} from '@console/internal/actions/dashboards';
1313
import { PrometheusResponse } from '@console/internal/components/graphs';
14-
import { RESULTS_TYPE } from '@console/internal/reducers/dashboards';
14+
import { RESULTS_TYPE } from '@console/internal/reducers/dashboard-results';
1515
import { RootState } from 'public/redux';
1616
import { useNotificationAlerts } from './useNotificationAlerts';
1717

frontend/packages/knative-plugin/src/components/services/ServiceDetailsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useParams, useLocation } from 'react-router-dom-v5-compat';
66
import { useActivePerspective } from '@console/dynamic-plugin-sdk';
77
import { Conditions } from '@console/internal/components/conditions';
88
import { DetailsPage } from '@console/internal/components/factory';
9-
import { PodsPage } from '@console/internal/components/pod';
9+
import { PodsPage } from '@console/internal/components/pod-list';
1010
import {
1111
ContainerTable,
1212
DetailsItem,

frontend/packages/topology/src/filters/NameLabelFilterDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
1010
import { useTranslation } from 'react-i18next';
1111
import AutocompleteInput from '@console/internal/components/autocomplete';
12-
import { TextFilter } from '@console/internal/components/factory';
12+
import { TextFilter } from '@console/internal/components/factory/text-filter';
1313
import { K8sResourceKind } from '@console/internal/module/k8s';
1414
import { NameLabelFilterValues } from './filter-utils';
1515

frontend/public/actions/__tests__/dashboards.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import {
77
stopWatchPrometheusQuery,
88
watchPrometheusQuery,
99
} from '../dashboards';
10-
import { RESULTS_TYPE, defaults } from '../../reducers/dashboards';
10+
import { defaults } from '../../reducers/dashboards';
11+
import { RESULTS_TYPE } from '../../reducers/dashboard-results';
1112

1213
const testStopWatch = (stopAction, type: RESULTS_TYPE, key: string) => {
1314
expect(stopAction(key)).toEqual({

frontend/public/actions/common.ts

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,35 @@
11
import { action } from 'typesafe-actions';
22

3-
enum ActionType {
3+
export enum ActionType {
4+
DismissOverviewDetails = 'dismissOverviewDetails',
5+
SelectOverviewDetailsTab = 'selectOverviewDetailsTab',
6+
SelectOverviewItem = 'selectOverviewItem',
7+
SetActiveApplication = 'setActiveApplication',
8+
SetActiveNamespace = 'setActiveNamespace',
49
SetCreateProjectMessage = 'setCreateProjectMessage',
10+
SetCurrentLocation = 'setCurrentLocation',
11+
SetServiceLevel = 'setServiceLevel',
12+
NotificationDrawerToggleExpanded = 'notificationDrawerExpanded',
513
SetClusterID = 'setClusterID',
14+
SortList = 'sortList',
15+
UpdateOverviewMetrics = 'updateOverviewMetrics',
16+
UpdateOverviewResources = 'updateOverviewResources',
17+
UpdateOverviewSelectedGroup = 'updateOverviewSelectedGroup',
18+
UpdateOverviewLabels = 'updateOverviewLabels',
19+
UpdateOverviewFilterValue = 'updateOverviewFilterValue',
20+
UpdateTimestamps = 'updateTimestamps',
21+
SetPodMetrics = 'setPodMetrics',
22+
SetNamespaceMetrics = 'setNamespaceMetrics',
23+
SetNodeMetrics = 'setNodeMetrics',
24+
SetPVCMetrics = 'setPVCMetrics',
25+
SetUtilizationDuration = 'SetUtilizationDuration',
26+
SetUtilizationDurationSelectedKey = 'SetUtilizationDurationSelectedKey',
27+
SetUtilizationDurationEndTime = 'SetUtilizationDurationEndTime',
28+
SetShowOperandsInAllNamespaces = 'setShowOperandsInAllNamespaces',
29+
SetDeprecatedPackage = 'setDeprecatedPackage',
30+
SetDeprecatedChannel = 'setDeprecatedChannel',
31+
SetDeprecatedVersion = 'setDeprecatedVersion',
32+
SetPluginCSPViolations = 'setPluginCSPViolations',
633
}
734

835
export const setClusterID = (clusterID: string) => action(ActionType.SetClusterID, { clusterID });

frontend/public/actions/dashboards.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { action, ActionType as Action } from 'typesafe-actions';
22
import { Dispatch } from 'redux';
33

44
import { coFetchJSON } from '../co-fetch';
5-
import { k8sBasePath } from '../module/k8s/k8s';
6-
import { isWatchActive, RESULTS_TYPE } from '../reducers/dashboards';
5+
import { k8sBasePath } from '../module/k8s/consts';
6+
import { isWatchActive, RESULTS_TYPE } from '../reducers/dashboard-results';
77
import type { RootState } from '../redux';
88
import { getPrometheusURL, PrometheusEndpoint } from '../components/graphs/helpers';
99
import { PrometheusResponse } from '../components/graphs';

0 commit comments

Comments
 (0)