From 3c54ee6992ec64cab1e0ccd419c39fecd2653a5b Mon Sep 17 00:00:00 2001 From: Afreen Misbah Date: Sun, 17 May 2026 06:43:30 +0530 Subject: [PATCH] mgr/dashboard: remove fork-awesome package dependency - Remove fork-awesome 1.2.0 from dependencies - Update package-lock.json accordingly Signed-off-by: Afreen Misbah Assisted-by: Claude Fixes: https://tracker.ceph.com/issues/76631 --- src/pybind/mgr/dashboard/frontend/package-lock.json | 11 ----------- src/pybind/mgr/dashboard/frontend/package.json | 1 - .../components/card-row/card-row.component.scss | 1 - .../app/shared/datatable/table/table.component.scss | 1 - .../frontend/src/app/shared/enum/icons.enum.ts | 5 +++++ .../app/shared/services/api-interceptor.service.ts | 6 +++--- src/pybind/mgr/dashboard/frontend/src/styles.scss | 5 ----- 7 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/package-lock.json b/src/pybind/mgr/dashboard/frontend/package-lock.json index 7fa3b84a077..fbf6d2e76ba 100644 --- a/src/pybind/mgr/dashboard/frontend/package-lock.json +++ b/src/pybind/mgr/dashboard/frontend/package-lock.json @@ -34,7 +34,6 @@ "chartjs-adapter-moment": "1.0.1", "detect-browser": "5.3.0", "file-saver": "2.0.5", - "fork-awesome": "1.2.0", "js-yaml": "4.1.0", "lodash": "4.18.1", "moment": "2.29.4", @@ -19272,16 +19271,6 @@ "node": "*" } }, - "node_modules/fork-awesome": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fork-awesome/-/fork-awesome-1.2.0.tgz", - "integrity": "sha512-MNwTBnnudMIweHfDtTY8TeR5fxIAZ2w9o8ITn5XDySqdxa4k5AH8IuAMa89RVxDxgPNlosZxqkFKN5UmHXuYSw==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "license": "(OFL-1.1 AND MIT)", - "engines": { - "node": ">=0.10.3" - } - }, "node_modules/fork-ts-checker-webpack-plugin": { "version": "7.2.13", "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.13.tgz", diff --git a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json index 976a00f19df..18fc33addf6 100644 --- a/src/pybind/mgr/dashboard/frontend/package.json +++ b/src/pybind/mgr/dashboard/frontend/package.json @@ -69,7 +69,6 @@ "chartjs-adapter-moment": "1.0.1", "detect-browser": "5.3.0", "file-saver": "2.0.5", - "fork-awesome": "1.2.0", "js-yaml": "4.1.0", "lodash": "4.18.1", "moment": "2.29.4", diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.scss index f93d6313aac..ecee4ec73eb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.scss @@ -7,7 +7,6 @@ a.dropdown-toggle { &::after { border: 0; content: '\f054'; - font-family: 'ForkAwesome'; font-size: 1rem; margin-top: 0.15rem; transition: transform 0.3s ease-in-out; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss index 73f27263998..4ba33aa004c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss @@ -4,7 +4,6 @@ @mixin row-details-icon { color: vv.$gray-900; - font-family: 'ForkAwesome', sans-serif; font-size: 1rem; line-height: 1; } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts index dd23099bc40..34d631661b6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/icons.enum.ts @@ -96,6 +96,11 @@ export enum Icons { ibmCloudBareMetalServer = 'ibm-cloud--bare-metal-server', ibmCloudDedicatedHost = 'ibm-cloud--dedicated-host', clusterIcon = 'web-services--cluster', + /* Icon sizes */ + size16 = '16', + size20 = '20', + size24 = '24', + size32 = '32', /* Icons - Use IconSize enum for sizing instead of these deprecated values */ notification = 'notification', error = 'error--filled', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.ts index 404d635e8a7..59eaf018019 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.ts @@ -109,12 +109,12 @@ export class ApiInterceptorService implements HttpInterceptor { this.router.navigate(['/login']); break; case 403: - this.router.navigate([‘error’], { + this.router.navigate(['error'], { state: { message: $localize`Sorry, you don’t have permission to view this page or resource.`, header: $localize`Access Denied`, - icon: ‘locked’, - source: ‘forbidden’ + icon: 'locked', + source: 'forbidden' } }); break; diff --git a/src/pybind/mgr/dashboard/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss index 01bc0b1b076..ebfc501f584 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles.scss @@ -5,10 +5,6 @@ @import './src/styles/carbon-defaults.scss'; -// Fork-Awesome -$fa-font-path: '~fork-awesome/fonts'; -$font-family-icon: 'ForkAwesome'; - $badge-font-size: 1rem; $form-feedback-font-size: 100%; $popover-max-width: 350px; @@ -25,7 +21,6 @@ $grid-breakpoints: ( ); @import 'bootstrap/scss/bootstrap'; -@import 'fork-awesome/scss/fork-awesome'; @import 'app/ceph/rgw/rgw-overview-dashboard/rgw-overview-card-popover.scss'; @import './src/styles/bootstrap-extends'; @import './src/styles/ceph-custom/basics'; -- 2.47.3