Skip to content

Commit c2d33df

Browse files
committed
CONSOLE-4407: Fix scrollbar flickering issue
- Remove `Alt+F1` a11y help shortcut hint since the shortcut no longer exists in monaco - Fix long time bug where the commands in the command palette are bolded and underlined
2 parents 5ba7c26 + 84fa3ce commit c2d33df

File tree

229 files changed

+1090
-4368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+1090
-4368
lines changed

dynamic-demo-plugin/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
},
1616
"devDependencies": {
1717
"@openshift-console/dynamic-plugin-sdk": "file:../frontend/packages/console-dynamic-plugin-sdk/dist/core",
18-
"@openshift-console/dynamic-plugin-sdk-internal": "file:../frontend/packages/console-dynamic-plugin-sdk/dist/internal",
1918
"@openshift-console/dynamic-plugin-sdk-webpack": "file:../frontend/packages/console-dynamic-plugin-sdk/dist/webpack",
2019
"@openshift-console/plugin-shared": "file:../frontend/packages/console-plugin-shared/dist",
2120
"@patternfly/react-core": "^6.2.0-prerelease.15",
2221
"@patternfly/react-icons": "^6.2.0-prerelease.2",
2322
"@patternfly/react-table": "^6.2.0-prerelease.16",
24-
"@patternfly/react-topology": "6.1.0",
2523
"@types/react": "16.8.13",
2624
"@types/react-measure": "^2.0.6",
2725
"@types/react-router": "^5.1.20",

dynamic-demo-plugin/src/components/ExampleNamespacedPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const NamespacePageContent = ({ namespace }: { namespace?: string }) => {
2727
grow={{ default: 'grow' }}
2828
direction={{ default: 'column' }}
2929
>
30-
<h1>{t('Currently selected namespace')}</h1>
31-
<h2>{namespace}</h2>
30+
<Title headingLevel='h1'>{t('Currently selected namespace')}</Title>
31+
<Title headingLevel='h2'>{namespace}</Title>
3232
</Flex>
3333
</CardBody>
3434
</Card>

dynamic-demo-plugin/src/components/Nav.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { HorizontalNav } from '@openshift-console/dynamic-plugin-sdk';
33
import { useTranslation } from 'react-i18next';
4-
import { PageSection } from '@patternfly/react-core';
4+
import { PageSection, Title } from '@patternfly/react-core';
55

66
type Hero = {
77
customData: {
@@ -13,15 +13,15 @@ const Thor: React.FC<Hero> = ( {customData} ) => {
1313
const { t } = useTranslation();
1414

1515
return <PageSection>
16-
<h1>{t('plugin__console-demo-plugin~Hello {{planet}}! I am Thor!', { planet: customData.planet })}</h1>
16+
<Title headingLevel='h1'>{t('plugin__console-demo-plugin~Hello {{planet}}! I am Thor!', { planet: customData.planet })}</Title>
1717
</PageSection>
1818
};
1919

2020
const Loki: React.FC<Hero> = ( {customData} ) => {
2121
const { t } = useTranslation();
2222

2323
return <PageSection>
24-
<h1>{t('plugin__console-demo-plugin~Hello {{planet}}! I am Loki!', { planet: customData.planet })}</h1>
24+
<Title headingLevel='h1'>{t('plugin__console-demo-plugin~Hello {{planet}}! I am Loki!', { planet: customData.planet })}</Title>
2525
</PageSection>
2626
};
2727

dynamic-demo-plugin/yarn.lock

Lines changed: 11 additions & 664 deletions
Large diffs are not rendered by default.

frontend/get-active-plugins.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable tsdoc/syntax */ // This file is written in JavaScript, so we use JSDoc here. TSDoc rules don't apply
22
// @ts-check
3+
const { getActivePluginsModuleData } = require('@console/plugin-sdk/src/codegen/active-plugins');
34

45
/**
56
* Get the current Console active plugins virtual module information.
@@ -8,17 +9,17 @@
89
*
910
*
1011
* @param {object} options
11-
* @param {() => import('./packages/console-plugin-sdk/src/codegen/active-plugins').ActivePluginsModuleData} options.getModuleData
12+
* @param {import('@console/plugin-sdk/src/codegen/plugin-resolver').PluginPackage[]} options.pluginPackages
1213
* @param {import('webpack').LoaderContext<any>} loaderContext
1314
*
1415
* @returns {{code: string}} Generated module source code.
1516
*/
16-
const getActivePlugins = ({ getModuleData }, loaderContext) => {
17+
const getActivePlugins = ({ pluginPackages }, loaderContext) => {
1718
const {
1819
code,
1920
diagnostics: { errors, warnings },
2021
fileDependencies,
21-
} = getModuleData();
22+
} = getActivePluginsModuleData(pluginPackages);
2223
// eslint-disable-next-line no-console
2324
console.log(
2425
`Console active plugins virtual module code generated with ${errors.length} errors and ${warnings.length} warnings`,

frontend/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
},
134134
"dependencies": {
135135
"@patternfly-5/patternfly": "npm:@patternfly/patternfly@5.4.2",
136-
"@patternfly/patternfly": "^6.2.0-prerelease.2",
136+
"@patternfly/patternfly": "^6.2.0-prerelease.3",
137137
"@patternfly/quickstarts": "^6.2.0-prerelease.4",
138138
"@patternfly/react-catalog-view-extension": "^6.1.0-prerelease.3",
139139
"@patternfly/react-charts": "^8.2.0-prerelease.13",
@@ -198,7 +198,7 @@
198198
"react-linkify": "^0.2.2",
199199
"react-measure": "^2.2.6",
200200
"react-modal": "^3.12.1",
201-
"react-redux": "7.2.2",
201+
"react-redux": "7.2.9",
202202
"react-router": "5.3.x",
203203
"react-router-dom": "5.3.x",
204204
"react-router-dom-v5-compat": "^6.11.2",
@@ -253,7 +253,6 @@
253253
"@types/react-helmet": "5.x",
254254
"@types/react-jsonschema-form": "^1.3.8",
255255
"@types/react-measure": "^2.0.6",
256-
"@types/react-redux": "6.0.2",
257256
"@types/react-router": "^5.1.20",
258257
"@types/react-router-dom": "5.3.x",
259258
"@types/react-transition-group": "2.x",
@@ -342,7 +341,8 @@
342341
"@patternfly/react-icons": "^6.2.0-prerelease.2",
343342
"@patternfly/react-styles": "^6.2.0-prerelease.2",
344343
"@patternfly/react-table": "^6.2.0-prerelease.16",
345-
"@patternfly/react-tokens": "^6.2.0-prerelease.2"
344+
"@patternfly/react-tokens": "^6.2.0-prerelease.2",
345+
"async": "^3.2.5"
346346
},
347347
"lint-staged": {
348348
"*.{js,jsx,ts,tsx,json,gql,graphql}": "eslint --color --fix"

frontend/packages/console-app/console-extensions.json

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,12 @@
465465
]
466466
}
467467
},
468+
{
469+
"type": "console.flag/hookProvider",
470+
"properties": {
471+
"handler": { "$codeRef": "userPreferences.usePerspectivesAvailable" }
472+
}
473+
},
468474
{
469475
"type": "console.user-preference/group",
470476
"properties": {
@@ -527,6 +533,9 @@
527533
"component": { "$codeRef": "userPreferences.PreferredPerspectiveSelect" }
528534
},
529535
"insertAfter": "console.theme"
536+
},
537+
"flags": {
538+
"required": ["FLAG_PERSPECTIVES_AVAILABLE"]
530539
}
531540
},
532541
{
@@ -646,7 +655,7 @@
646655
"perspective": "admin",
647656
"id": "home",
648657
"name": "%console-app~Home%",
649-
"dataAttributes": { "data-quickstart-id": "qs-nav-home" }
658+
"dataAttributes": { "data-quickstart-id": "qs-nav-home", "data-tour-id": "tour-home-nav" }
650659
}
651660
},
652661
{
@@ -665,7 +674,10 @@
665674
"perspective": "admin",
666675
"id": "workloads",
667676
"name": "%console-app~Workloads%",
668-
"dataAttributes": { "data-quickstart-id": "qs-nav-workloads" },
677+
"dataAttributes": {
678+
"data-quickstart-id": "qs-nav-workloads",
679+
"data-tour-id": "tour-workloads-nav"
680+
},
669681
"insertAfter": "operators"
670682
}
671683
},
@@ -736,9 +748,6 @@
736748
"dataAttributes": {
737749
"data-quickstart-id": "qs-nav-monitoring"
738750
}
739-
},
740-
"flags": {
741-
"required": ["PROMETHEUS", "MONITORING", "CAN_GET_NS"]
742751
}
743752
},
744753
{

frontend/packages/console-app/locales/en/console-app.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,17 @@
271271
"Access review rules": "Access review rules",
272272
"Incompatible file type": "Incompatible file type",
273273
"{{fileName}} cannot be uploaded. Only {{fileExtensions}} files are supported currently. Try another file.": "{{fileName}} cannot be uploaded. Only {{fileExtensions}} files are supported currently. Try another file.",
274+
"Access our new quick starts where you can learn more about creating or deploying an application using OpenShift Developer Console. You can also restart this tour anytime here.": "Access our new quick starts where you can learn more about creating or deploying an application using OpenShift Developer Console. You can also restart this tour anytime here.",
275+
"Set your individual console preferences including default views, language, import settings, and more.": "Set your individual console preferences including default views, language, import settings, and more.",
276+
"Stay up-to-date with everything OpenShift on our <2>blog</2> or continue to learn more in our <6>documentation</6>.": "Stay up-to-date with everything OpenShift on our <2>blog</2> or continue to learn more in our <6>documentation</6>.",
277+
"Welcome to the new OpenShift experience!": "Welcome to the new OpenShift experience!",
278+
"Our new update with OpenShift 4.19 gives a more modern look to help enhance your experience and streamline your workflow, such as improved navigation and infrastructure. Want us to show you around?": "Our new update with OpenShift 4.19 gives a more modern look to help enhance your experience and streamline your workflow, such as improved navigation and infrastructure. Want us to show you around?",
279+
"Here is where you can view all of your OpenShift enviroments, including your projects and inventory. You can also access APIs and software catalogs.": "Here is where you can view all of your OpenShift enviroments, including your projects and inventory. You can also access APIs and software catalogs.",
280+
"Software Catalog": "Software Catalog",
281+
"Add shared applications, services, event sources, or source-to-image builders to your project. Cluster administrators can customize the content made available in the catalog.": "Add shared applications, services, event sources, or source-to-image builders to your project. Cluster administrators can customize the content made available in the catalog.",
282+
"Help": "Help",
283+
"User Preferences": "User Preferences",
284+
"You’re ready to go!": "You’re ready to go!",
274285
"Red Hat OpenShift Lightspeed": "Red Hat OpenShift Lightspeed",
275286
"Meet OpenShift Lightspeed": "Meet OpenShift Lightspeed",
276287
"Unlock possibilities and enhance productivity with the AI-powered assistant's expert guidance in your OpenShift web console.": "Unlock possibilities and enhance productivity with the AI-powered assistant's expert guidance in your OpenShift web console.",
@@ -596,7 +607,6 @@
596607
"Select a perspective": "Select a perspective",
597608
"Select an option": "Select an option",
598609
"User Preferences {{activeTab}}": "User Preferences {{activeTab}}",
599-
"User Preferences": "User Preferences",
600610
"Set your individual preferences for the console experience. Any changes will be autosaved.": "Set your individual preferences for the console experience. Any changes will be autosaved.",
601611
"Only {{volumeMode}} volume mode is available for {{storageClass}} with {{accessMode}} access mode": "Only {{volumeMode}} volume mode is available for {{storageClass}} with {{accessMode}} access mode",
602612
"VolumeSnapshotClass with same provisioner as claim": "VolumeSnapshotClass with same provisioner as claim",

frontend/packages/console-app/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"@console/knative-plugin": "0.0.0-fixed",
1818
"@console/local-storage-operator-plugin": "0.0.0-fixed",
1919
"@console/metal3-plugin": "0.0.0-fixed",
20-
"@console/network-attachment-definition-plugin": "0.0.0-fixed",
2120
"@console/operator-lifecycle-manager": "0.0.0-fixed",
2221
"@console/operator-lifecycle-manager-v1": "0.0.0-fixed",
2322
"@console/patternfly": "0.0.0-fixed",
@@ -49,7 +48,6 @@
4948
"nodeStatus": "src/components/nodes/status",
5049
"nodeActions": "src/components/nodes/menu-actions.tsx",
5150
"oauthConfigDetailsPage": "src/components/oauth-config/OAuthConfigDetailsPage.tsx",
52-
"multiNetworkFlag": "src/components/network-policies/multi-network-policy/multiNetworkFlag.ts",
5351
"consolePluginDescriptionDetail": "src/components/console-operator/ConsolePluginDescriptionDetail.tsx",
5452
"consolePluginVersionDetail": "src/components/console-operator/ConsolePluginVersionDetail.tsx",
5553
"consolePluginStatusDetail": "src/components/console-operator/ConsolePluginStatusDetail.tsx",

frontend/packages/console-app/src/components/admission-webhook-warnings/AdmissionWebhookWarningNotifications.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
import * as React from 'react';
22
import { AlertVariant } from '@patternfly/react-core';
3+
import { Map } from 'immutable';
34
import { useTranslation } from 'react-i18next';
4-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
5-
// @ts-ignore: FIXME out-of-sync @types/react-redux version as new types cause many build errors
65
import { useDispatch, useSelector } from 'react-redux';
76
import {
87
AdmissionWebhookWarning,
9-
CoreState,
108
getAdmissionWebhookWarnings,
119
removeAdmissionWebhookWarning,
10+
SDKStoreState,
1211
} from '@console/dynamic-plugin-sdk/src';
1312
import { documentationURLs, getDocumentationURL } from '@console/internal/components/utils';
1413
import { useToast } from '@console/shared/src';
1514

1615
type UseAdmissionWebhookWarnings = () => Map<string, AdmissionWebhookWarning>;
1716
const useAdmissionWebhookWarnings: UseAdmissionWebhookWarnings = () =>
18-
useSelector<CoreState, Map<string, AdmissionWebhookWarning>>(getAdmissionWebhookWarnings);
17+
useSelector<SDKStoreState, Map<string, AdmissionWebhookWarning>>(getAdmissionWebhookWarnings);
1918

2019
export const AdmissionWebhookWarningNotifications = () => {
2120
const { t } = useTranslation();

0 commit comments

Comments
 (0)