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 <afreen@ibm.com>
Assisted-by: Claude
Fixes: https://tracker.ceph.com/issues/76631

diff --git a/src/pybind/mgr/dashboard/frontend/package-lock.json b/src/pybind/mgr/dashboard/frontend/package-lock.json
index 7fa3b84a077abea0cdf44a3e8ea6c97ad4e4f1df..fbf6d2e76baff9d9cefa57277f6e794a5e385a75 100644 (file)
--- 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 976a00f19dfdfe04bf1610808c4d66e626a29062..18fc33addf655150df02ae9cf6bc33bd60131759 100644 (file)
--- 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 f93d6313aac31e6a3320fd7bb3691d37d68b3e48..ecee4ec73ebb9ab39d2e4a2dc03a218415194a53 100644 (file)
--- 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 73f272639987a78b16a3ac3b88674394aab6d743..4ba33aa004c50134fda8ce60283544a9f4492ae4 100644 (file)
--- 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 dd23099bc40205a624199211e5b07416244b3b45..34d631661b669fada3e243af9cf8c63242ad8a51 100644 (file)
--- 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 404d635e8a702328cbe8ad0d67cd2958417bd072..59eaf018019c35039b3f15fe168bb083193e125e 100644 (file)
--- 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 01bc0b1b076b0db209d74b9d89681dff3f8c44e3..ebfc501f5842b3cbe96722cd9b84ec47fc1b3301 100644 (file)
--- 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';