mgr/dashboard: Remove ngx-store

This package is only used in one place, doesn't work with Angular 9 and
hasn't been updated in a while.

Fixes: https://tracker.ceph.com/issues/44449
Signed-off-by: Tiago Melo <tmelo@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/package-lock.json b/src/pybind/mgr/dashboard/frontend/package-lock.json
index 2764ddec4bbaff7f59914da0944b6b5c66370fc8..c31c544c3aff9857ec58b248baf5dc30156af04c 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/package-lock.json
+++ b/src/pybind/mgr/dashboard/frontend/package-lock.json
@@ -10690,31 +10690,11 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
     },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
-    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
     },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -11428,19 +11408,6 @@
       "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-5.1.2.tgz",
       "integrity": "sha512-L9flZCGEf+/G0sOZXs3WJ2tp7SW6/7soQbAnpFmlvFURcSKv9p2/aiH/VbG47Ra50e5i6q3ereKEo7IpGEQwVQ=="
     },
-    "ngx-store": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ngx-store/-/ngx-store-2.1.0.tgz",
-      "integrity": "sha512-NVFP/VUctQuzwGqmaSx6bbQwT1XmGmHe0ACTMyxoWq7gmpAFAt/LkGuei70aX4ukyH1tQNk9zuYzTQlQOIG7rg==",
-      "requires": {
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "lodash.merge": "^4.6.1",
-        "lodash.set": "^4.3.2",
-        "ts-debug": "^1.3.0",
-        "tslib": "^1.9.3"
-      }
-    },
     "ngx-toastr": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-11.0.0.tgz",
@@ -15544,11 +15511,6 @@
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true
     },
-    "ts-debug": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-debug/-/ts-debug-1.3.0.tgz",
-      "integrity": "sha512-sP9Q4Nfqu5ImWLH955PpxbjR2zgLWS3NIc2tCw/JZtZMFFxUZe3fvkhdA0vSIpjiGFKPwCg6v0drthjwnSQTGA=="
-    },
     "ts-jest": {
       "version": "24.3.0",
       "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz",
@@ -18299,4 +18261,4 @@
       "integrity": "sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag=="
     }
   }
-}
\ No newline at end of file
+}

diff --git a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json
index b5100ffd3b89cfce17b68e62c5c0b0066404cc0e..a4ab9454c543de65adc06298cb817b792f916536 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/package.json
+++ b/src/pybind/mgr/dashboard/frontend/package.json
@@ -104,7 +104,6 @@
     "ng2-charts": "2.3.0",
     "ng2-tree": "2.0.0-rc.11",
     "ngx-bootstrap": "5.1.2",
-    "ngx-store": "2.1.0",
     "ngx-toastr": "11.0.0",
     "rxjs": "6.5.3",
     "rxjs-compat": "6.5.3",

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
index 3152a1233e3ef11991328ba214a838e6d09f30d8..bc60f1011c44455838460819e79a3dc56676235a 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
@@ -16,7 +16,6 @@ import { NgBootstrapFormValidationModule } from 'ng-bootstrap-form-validation';
 import { AccordionModule } from 'ngx-bootstrap/accordion';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { TabsModule } from 'ngx-bootstrap/tabs';
-import { WebStorageModule } from 'ngx-store';
 import { ToastrModule } from 'ngx-toastr';
 
 import { AppRoutingModule } from './app-routing.module';
@@ -56,8 +55,7 @@ export function jwtTokenGetter() {
         tokenGetter: jwtTokenGetter
       }
     }),
-    NgBootstrapFormValidationModule.forRoot(),
-    WebStorageModule
+    NgBootstrapFormValidationModule.forRoot()
   ],
   exports: [SharedModule],
   providers: [

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts
index c395e4650a56fae998a2aef56e2c1a407a19f990..6af8bc04ac6cfbc195903c575b4779e9351604be 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts
@@ -11,7 +11,6 @@ import {
 import { Mutex } from 'async-mutex';
 import * as _ from 'lodash';
 import * as moment from 'moment';
-import { LocalStorage } from 'ngx-store';
 import { Subscription } from 'rxjs';
 
 import { ExecutingTask } from '../../../shared/models/executing-task';
@@ -46,7 +45,7 @@ export class NotificationsSidebarComponent implements OnInit, OnDestroy {
   icons = Icons;
 
   // Tasks
-  @LocalStorage() last_task = '';
+  last_task = '';
   mutex = new Mutex();
 
   simplebar = {
@@ -78,6 +77,8 @@ export class NotificationsSidebarComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.last_task = window.localStorage.getItem('last_task');
+
     const permissions = this.authStorageService.getPermissions();
     if (permissions.prometheus.read && permissions.configOpt.read) {
       this.triggerPrometheusAlerts();
@@ -128,6 +129,7 @@ export class NotificationsSidebarComponent implements OnInit, OnDestroy {
 
           if (!this.last_task || moment(task.end_time).isAfter(this.last_task)) {
             this.last_task = task.end_time;
+            window.localStorage.setItem('last_task', this.last_task);
           }
 
           this.notificationService.save(notification);