diff --git a/package.json b/package.json index 7445dc1c7..e6d049e85 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "ts-loader": "^9.5.1", "tsconfig-paths-webpack-plugin": "^4.1.0", "tslib": "^2.7.0", - "typescript": "^4.9.5", + "typescript": "^5.6.2", "url-loader": "^4.1.1", "wait-on": "^7.0.1", "webpack": "^5.94.0", diff --git a/src/app/About/AboutDescription.tsx b/src/app/About/AboutDescription.tsx index d2d2047cb..98ce7fa82 100644 --- a/src/app/About/AboutDescription.tsx +++ b/src/app/About/AboutDescription.tsx @@ -40,7 +40,7 @@ export const AboutDescription: React.FC = () => { if (!cryostatVersion) { return; } - const expr = /^(?v[0-9]+\.[0-9]+\.[0-9]+)(?:-snapshot)?$/; + const expr = /^(v[0-9]+\.[0-9]+\.[0-9]+)(?:-snapshot)?$/; const result = cryostatVersion.match(expr); if (!result) { notificationsContext.warning( diff --git a/src/app/Dashboard/LayoutTemplateGroup.tsx b/src/app/Dashboard/LayoutTemplateGroup.tsx index 00e80c2cc..069f051fc 100644 --- a/src/app/Dashboard/LayoutTemplateGroup.tsx +++ b/src/app/Dashboard/LayoutTemplateGroup.tsx @@ -89,10 +89,10 @@ export const LayoutTemplateGroup: React.FC = ({ - {props.title} ({t('LayoutTemplateGroup.ITEMS', { count: props.templates.length })}) + {t(props.title, { ns: 'common' })} ({t('LayoutTemplateGroup.ITEMS', { count: props.templates.length })}) - {props.title === t('SUGGESTED', { ns: 'common' }) && props.templates.length !== 1 && ( + {props.title === 'Suggested' && props.templates.length !== 1 && ( <> diff --git a/src/app/Dashboard/LayoutTemplatePicker.tsx b/src/app/Dashboard/LayoutTemplatePicker.tsx index 25ba5699a..2a5c7c012 100644 --- a/src/app/Dashboard/LayoutTemplatePicker.tsx +++ b/src/app/Dashboard/LayoutTemplatePicker.tsx @@ -626,20 +626,13 @@ export const LayoutTemplatePicker: React.FC = ({ onTe {allSearchableTemplateNames.length > 0 ? ( <> - {sortedFilteredFeatureLeveledTemplateLayoutGroup(t('SUGGESTED', { ns: 'common' }), [ - BlankLayout, - ...RecentTemplates, - ])} + {sortedFilteredFeatureLeveledTemplateLayoutGroup('Suggested', [BlankLayout, ...RecentTemplates])} {sortedFilteredFeatureLeveledTemplateLayoutGroup( 'Cryostat', CryostatLayoutTemplates, userSubmittedTemplates.length > 0, )} - {sortedFilteredFeatureLeveledTemplateLayoutGroup( - t('USER_SUBMITTED', { ns: 'common' }), - userSubmittedTemplates, - false, - )} + {sortedFilteredFeatureLeveledTemplateLayoutGroup('User-submitted', userSubmittedTemplates, false)} ) : ( diff --git a/yarn.lock b/yarn.lock index 310527ceb..6f3a0f6d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4504,7 +4504,7 @@ __metadata: ts-loader: ^9.5.1 tsconfig-paths-webpack-plugin: ^4.1.0 tslib: ^2.7.0 - typescript: ^4.9.5 + typescript: ^5.6.2 url-loader: ^4.1.1 wait-on: ^7.0.1 webpack: ^5.94.0 @@ -13831,16 +13831,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.9.5": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db - languageName: node - linkType: hard - "typescript@npm:^5.0.4": version: 5.3.3 resolution: "typescript@npm:5.3.3" @@ -13851,13 +13841,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@^4.9.5#~builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=289587" +"typescript@npm:^5.6.2": + version: 5.6.2 + resolution: "typescript@npm:5.6.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 1f8f3b6aaea19f0f67cba79057674ba580438a7db55057eb89cc06950483c5d632115c14077f6663ea76fd09fce3c190e6414bb98582ec80aa5a4eaf345d5b68 + checksum: 48777e1dabd9044519f56cd012b0296e3b72bafe12b7e8e34222751d45c67e0eba5387ecdaa6c14a53871a29361127798df6dc8d1d35643a0a47cb0b1c65a33a languageName: node linkType: hard @@ -13871,6 +13861,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@^5.6.2#~builtin": + version: 5.6.2 + resolution: "typescript@patch:typescript@npm%3A5.6.2#~builtin::version=5.6.2&hash=f3b441" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: c084ee1ab865f108c787e6233a5f63c126c482c0c8e87ec998ac5288a2ad54b603e1ea8b8b272355823b833eb31b9fabb99e8c6152283e1cb47e3a76bd6faf6c + languageName: node + linkType: hard + "uint8array-extras@npm:^1.1.0, uint8array-extras@npm:^1.3.0": version: 1.4.0 resolution: "uint8array-extras@npm:1.4.0"