remove duplicate implementation of Settings services and consolidate them.

resources/frontend_client/app/admin/settings/settings.controllers.js

@@ -6,7 +6,7 @@ import SettingsEditor from './components/SettingsEditor.react';
 
 import Humanize from "humanize";
 
-var SettingsAdminControllers = angular.module('metabaseadmin.settings.controllers', ['metabaseadmin.settings.services']);
+var SettingsAdminControllers = angular.module('metabaseadmin.settings.controllers', ['metabase.services']);
 
 // from common.clj
 var TIMEZONES = [
@@ -36,11 +36,11 @@ var EXTRA_SETTINGS_METADATA = {
     "email-from-address":   { display_name: "From Address",       section: "Email",   index: 5, type: "string" },
 };
 
-SettingsAdminControllers.controller('SettingsEditor', ['$scope', 'SettingsAdminServices', 'AppState', 'settings', function($scope, SettingsAdminServices, AppState, settings) {
+SettingsAdminControllers.controller('SettingsEditor', ['$scope', 'Settings', 'AppState', 'settings', function($scope, Settings, AppState, settings) {
     $scope.SettingsEditor = SettingsEditor;
 
     $scope.updateSetting = async function(setting) {
-        await SettingsAdminServices.put({ key: setting.key }, setting).$promise;
+        await Settings.put({ key: setting.key }, setting).$promise;
         AppState.refreshSiteSettings();
     }
 

resources/frontend_client/app/admin/settings/settings.module.js

@@ -2,7 +2,7 @@
 
 var SettingsAdmin = angular.module('metabaseadmin.settings', [
     'metabaseadmin.settings.controllers',
-    'metabaseadmin.settings.services'
+    'metabase.services'
 ]);
 
 SettingsAdmin.config(['$routeProvider', function($routeProvider) {
@@ -10,8 +10,8 @@ SettingsAdmin.config(['$routeProvider', function($routeProvider) {
         template: '<div class="flex flex-column flex-full" mb-react-component="SettingsEditor"></div>',
         controller: 'SettingsEditor',
         resolve: {
-            settings: ['SettingsAdminServices', async function(SettingsAdminServices) {
-                var settings = await SettingsAdminServices.list().$promise
+            settings: ['Settings', async function(Settings) {
+                var settings = await Settings.list().$promise
                 return settings.map(function(setting) {
                     setting.originalValue = setting.value;
                     return setting;

resources/frontend_client/app/admin/settings/settings.services.js

-'use strict';
-
-var SettingsAdminServices = angular.module('metabaseadmin.settings.services', ['ngResource']);
-
-SettingsAdminServices.factory('SettingsAdminServices', ['$resource', function($resource) {
-    return $resource('/api/setting', {}, {
-        list: {
-            url: '/api/setting',
-            method: 'GET',
-            isArray: true
-        },
-
-        // POST endpoint handles create + update in this case
-        put: {
-            url: '/api/setting/:key',
-            method: 'PUT',
-            params: {
-                key: '@key'
-            }
-        },
-
-        delete: {
-            url: '/api/setting/:key',
-            method: 'DELETE',
-            params: {
-                key: '@key'
-            }
-        }
-    });
-}]);

resources/frontend_client/app/setup/setup.controllers.js

 'use strict';
 
-var SetupControllers = angular.module('metabase.setup.controllers', ['metabase.metabase.services', 'metabaseadmin.settings.services', 'metabase.setup.services']);
+var SetupControllers = angular.module('metabase.setup.controllers', ['metabase.metabase.services', 'metabase.setup.services']);
 
 SetupControllers.controller('SetupInit', ['$scope', '$location', '$routeParams', 'AppState',
     function($scope, $location, $routeParams, AppState) {
@@ -14,8 +14,8 @@ SetupControllers.controller('SetupInit', ['$scope', '$location', '$routeParams',
     }
 ]);
 
-SetupControllers.controller('SetupInfo', ['$scope', '$routeParams', '$location', '$timeout', 'ipCookie', 'User', 'AppState', 'Setup', 'SettingsAdminServices',
-    function($scope, $routeParams, $location, $timeout, ipCookie, User, AppState, Setup, SettingsAdminServices) {
+SetupControllers.controller('SetupInfo', ['$scope', '$routeParams', '$location', '$timeout', 'ipCookie', 'User', 'AppState', 'Setup', 'Settings',
+    function($scope, $routeParams, $location, $timeout, ipCookie, User, AppState, Setup, Settings) {
         $scope.activeStep = "user";
         $scope.completedSteps = {
             user: false,
@@ -109,7 +109,7 @@ SetupControllers.controller('SetupInfo', ['$scope', '$routeParams', '$location',
         }
 
         function setSiteName() {
-            return SettingsAdminServices.put({
+            return Settings.put({
                 'key': 'site-name',
                 'value': $scope.newUser.siteName
             }).$promise.then(function(success) {