remove KVStore / ngStorage.js

Rewritten into storage.ts, this Angular service is not needed anymore. We can remove the file, remove it from index.js, and remove it as a dependency from all of the Angular modules that previously used it.
e-mission · Sep 27, 2023 · 6ffbf18 · 6ffbf18
1 parent b99e001
commit 6ffbf18
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 236 deletions.
diff --git a/www/index.js b/www/index.js
@@ -31,4 +31,3 @@ import './js/control/uploadService.js';
 import './js/metrics-factory.js';
 import './js/metrics-mappings.js';
 import './js/plugin/logger.ts';
-import './js/plugin/ngStorage.js';
diff --git a/www/js/metrics-factory.js b/www/js/metrics-factory.js
@@ -6,8 +6,7 @@ import { labelOptions } from './survey/multilabel/confirmHelper';
 import { storageGet, storageRemove, storageSet } from './plugin/storage';
 
 angular.module('emission.main.metrics.factory',
-        ['emission.main.metrics.mappings',
-        'emission.plugin.kvstore'])
+        ['emission.main.metrics.mappings'])
 
 .factory('FootprintHelper', function(CarbonDatasetHelper, CustomDatasetHelper) {
   var fh = {};
@@ -145,7 +144,7 @@ angular.module('emission.main.metrics.factory',
   return fh;
 })
 
-.factory('CalorieCal', function(KVStore, METDatasetHelper, CustomDatasetHelper) {
+.factory('CalorieCal', function(METDatasetHelper, CustomDatasetHelper) {
 
   var cc = {};
   var highestMET = 0;

diff --git a/www/js/metrics-mappings.js b/www/js/metrics-mappings.js
@@ -3,10 +3,9 @@ import { getLabelOptions } from './survey/multilabel/confirmHelper';
 import { getConfig } from './config/dynamicConfig';
 import { storageGet, storageSet } from './plugin/storage';
 
-angular.module('emission.main.metrics.mappings', ['emission.plugin.logger',
-                                     'emission.plugin.kvstore'])
+angular.module('emission.main.metrics.mappings', ['emission.plugin.logger'])
 
-.service('CarbonDatasetHelper', function(KVStore) {
+.service('CarbonDatasetHelper', function() {
   var CARBON_DATASET_KEY = 'carbon_dataset_locale';
 
   // Values are in Kg/PKm (kilograms per passenger-kilometer)
@@ -182,7 +181,7 @@ angular.module('emission.main.metrics.mappings', ['emission.plugin.logger',
     return carbonDatasets[currentCarbonDatasetCode].footprintData;
   };
 })
-.service('METDatasetHelper', function(KVStore) {
+.service('METDatasetHelper', function() {
   var standardMETs = {
     "WALKING": {
       "VERY_SLOW": {

diff --git a/www/js/plugin/ngStorage.js b/www/js/plugin/ngStorage.js
diff --git a/www/js/services.js b/www/js/services.js
@@ -2,8 +2,7 @@
 
 import angular from 'angular';
 
-angular.module('emission.services', ['emission.plugin.logger',
-                                     'emission.plugin.kvstore'])
+angular.module('emission.services', ['emission.plugin.logger'])
 
 .service('CommHelper', function($rootScope) {
     var getConnectURL = function(successCallback, errorCallback) {

diff --git a/www/js/splash/referral.js b/www/js/splash/referral.js
@@ -1,9 +1,9 @@
 import angular from 'angular';
 import { storageGetDirect, storageRemove, storageSet } from '../plugin/storage';
 
-angular.module('emission.splash.referral', ['emission.plugin.kvstore'])
+angular.module('emission.splash.referral', [])
 
-.factory('ReferralHandler', function($window, KVStore) {
+.factory('ReferralHandler', function($window) {
     var referralHandler = {};
 
     var REFERRAL_NAVIGATION_KEY = 'referral_navigation';

diff --git a/www/js/splash/startprefs.js b/www/js/splash/startprefs.js
@@ -3,11 +3,10 @@ import { getConfig } from '../config/dynamicConfig';
 import { storageGet, storageSet } from '../plugin/storage';
 
 angular.module('emission.splash.startprefs', ['emission.plugin.logger',
-                                              'emission.splash.referral',
-                                              'emission.plugin.kvstore'])
+                                              'emission.splash.referral'])
 
 .factory('StartPrefs', function($window, $state, $interval, $rootScope, $ionicPlatform,
-      $ionicPopup, KVStore, $http, Logger, ReferralHandler) {
+      $ionicPopup, $http, Logger, ReferralHandler) {
     var logger = Logger;
     var startprefs = {};
      // Boolean: represents that the "intro" - the one page summary