diff --git a/src/common/__mocks__/core.mock.configurations.js b/src/common/__mocks__/core.mock.configurations.js index 763126b1..6dfc0799 100644 --- a/src/common/__mocks__/core.mock.configurations.js +++ b/src/common/__mocks__/core.mock.configurations.js @@ -9,7 +9,7 @@ export default Rx.Observable.return([ username: '', password: '', projects: ['AdamNowotny/BuildReactor'], - disabled: false, + isDisabled: false, }, { name: 'OpenMRS', @@ -19,7 +19,7 @@ export default Rx.Observable.return([ username: '', password: '', projects: ['FUNC-APPTEST', 'FUNC-BUILDPERF', 'FUNC-PERF', 'JU-CORE'], - disabled: true, + isDisabled: true, }, { name: 'Jenkins', @@ -35,7 +35,7 @@ export default Rx.Observable.return([ 'infra_plugins_svn_to_git', 'infra_svnsync', ], - disabled: true, + isDisabled: true, }, { name: 'T1', @@ -45,7 +45,7 @@ export default Rx.Observable.return([ username: '', password: '', projects: ['bt308'], - disabled: true, + isDisabled: true, branch: '', }, { @@ -56,7 +56,7 @@ export default Rx.Observable.return([ username: '', password: '', projects: ['bt607'], - disabled: true, + isDisabled: true, branch: 'release', }, ]); diff --git a/src/service-worker/storage/service-config.test.ts b/src/service-worker/storage/service-config.test.ts index 5063aa95..e9bf0061 100644 --- a/src/service-worker/storage/service-config.test.ts +++ b/src/service-worker/storage/service-config.test.ts @@ -22,13 +22,13 @@ beforeEach(() => { baseUrl: 'test1', name: 'test1', projects: [], - disabled: false, + isDisabled: false, }, { baseUrl: 'test2', name: 'test2', projects: [], - disabled: true, + isDisabled: true, }, ]; (Storage.prototype.get as Mock).mockImplementation(() => testConfigs); @@ -59,8 +59,8 @@ describe('enableService', () => { await serviceConfig.enableService(testConfigs[DISABLED_SERVICE].name); expect(Storage.prototype.set).toBeCalledWith([ - { ...testConfigs[0], disabled: false }, - { ...testConfigs[1], disabled: false }, + { ...testConfigs[0], isDisabled: false }, + { ...testConfigs[1], isDisabled: false }, ]); }); }); @@ -78,8 +78,8 @@ describe('disableService', () => { await serviceConfig.disableService(testConfigs[ENABLED_SERVICE].name); expect(Storage.prototype.set).toBeCalledWith([ - { ...testConfigs[0], disabled: true }, - { ...testConfigs[1], disabled: true }, + { ...testConfigs[0], isDisabled: true }, + { ...testConfigs[1], isDisabled: true }, ]); }); }); @@ -109,7 +109,11 @@ describe('saveService', () => { await serviceConfig.saveService(newItem); - expect(Storage.prototype.set).toBeCalledWith([testConfigs[0], testConfigs[1], newItem]); + expect(Storage.prototype.set).toBeCalledWith([ + testConfigs[0], + testConfigs[1], + newItem, + ]); }); it('should save existing item', async () => { @@ -117,7 +121,10 @@ describe('saveService', () => { await serviceConfig.saveService(item); - expect(Storage.prototype.set).toBeCalledWith([item, testConfigs[DISABLED_SERVICE]]); + expect(Storage.prototype.set).toBeCalledWith([ + item, + testConfigs[DISABLED_SERVICE], + ]); }); }); @@ -145,7 +152,10 @@ describe('setBuildOrder', () => { }); it('should reorder builds', async () => { - await serviceConfig.setBuildOrder(testConfigs[ENABLED_SERVICE].name, ['build1', 'build2']); + await serviceConfig.setBuildOrder(testConfigs[ENABLED_SERVICE].name, [ + 'build1', + 'build2', + ]); expect(Storage.prototype.set).toBeCalledWith([ { ...testConfigs[ENABLED_SERVICE], projects: ['build1', 'build2'] }, diff --git a/src/service-worker/storage/service-config.ts b/src/service-worker/storage/service-config.ts index d078f9f0..b39eb216 100644 --- a/src/service-worker/storage/service-config.ts +++ b/src/service-worker/storage/service-config.ts @@ -32,7 +32,7 @@ const enableService = async (serviceName: string) => { if (!config) { throw new Error(`Service ${serviceName} not found`); } - config.disabled = false; + config.isDisabled = false; await setItem(serviceName, config); }; @@ -42,7 +42,7 @@ const disableService = async (serviceName: string) => { if (!config) { throw new Error(`Service ${serviceName} not found`); } - config.disabled = true; + config.isDisabled = true; await setItem(serviceName, config); }; diff --git a/src/services/service-monitor.ts b/src/services/service-monitor.ts index d17442de..e740e626 100644 --- a/src/services/service-monitor.ts +++ b/src/services/service-monitor.ts @@ -24,7 +24,7 @@ const alarmHandler = async (alarm: chrome.alarms.Alarm) => { const configChangedHandler = async (value: StorageChangeEvent) => { logger.log('service-monitor.onChanged', value); const serviceNames = value.newValue - .filter(config => !config.disabled) + .filter(config => !config.isDisabled) .map(config => config.name); await stateStorage.reset(serviceNames); await updateAll(value.newValue); @@ -35,7 +35,7 @@ const updateAll = async (allConfigs: CIServiceSettings[]) => { await chrome.alarms.clearAll(); const updatedServices = await Promise.all( allConfigs - .filter(config => !config.disabled) + .filter(config => !config.isDisabled) .map(async config => { const serviceState = await serviceRepository.getLatestBuilds(config); await stateStorage.updateService(config.name, serviceState); diff --git a/src/services/service-types.ts b/src/services/service-types.ts index 9f500dff..fe57a0c5 100644 --- a/src/services/service-types.ts +++ b/src/services/service-types.ts @@ -9,7 +9,7 @@ export interface CIServiceSettings { username?: string; password?: string; projects: string[]; - disabled?: boolean; + isDisabled?: boolean; repository?: string; } diff --git a/src/settings/directives/sidebar/sidebar.html b/src/settings/directives/sidebar/sidebar.html index c6a7dfbf..db878615 100644 --- a/src/settings/directives/sidebar/sidebar.html +++ b/src/settings/directives/sidebar/sidebar.html @@ -1,19 +1,32 @@
-
    -
  • + -
    +
      -
    • +
    • - + {{ currentConfig.name }}
      • diff --git a/src/settings/directives/topnav/topnav.js b/src/settings/directives/topnav/topnav.js index 42566368..ab25dd05 100644 --- a/src/settings/directives/topnav/topnav.js +++ b/src/settings/directives/topnav/topnav.js @@ -9,54 +9,56 @@ import renameTemplate from 'settings/directives/topnav/renameModal.html'; import template from 'settings/directives/topnav/topnav.html'; export default app.directive('topnav', ($uibModal, $location) => ({ - scope: { - service: '=currentService', - showActions: '=' - }, - templateUrl: template, - controller($scope, $element, $attrs, $transclude) { + scope: { + service: '=currentService', + showActions: '=', + }, + templateUrl: template, + controller($scope, $element, $attrs, $transclude) { + $scope.$watch('service', selectedService => { + $scope.isEnabled = selectedService && !selectedService.isDisabled; + }); - $scope.$watch('service', (selectedService) => { - $scope.isEnabled = selectedService && !selectedService.disabled; - }); + $scope.$on('onOffSwitch.change', (event, isEnabled) => { + if (!$scope.service) { + return; + } + if (isEnabled) { + core.enableService($scope.service.name); + } else { + core.disableService($scope.service.name); + } + }); - $scope.$on('onOffSwitch.change', (event, isEnabled) => { - if (!$scope.service) { - return; - } - if (isEnabled) { - core.enableService($scope.service.name); - } else { - core.disableService($scope.service.name); - } - }); + $scope.remove = function () { + $uibModal + .open({ + templateUrl: removeTemplate, + controller: 'RemoveModalCtrl', + scope: $scope, + resolve: { + serviceName: () => $scope.service.name, + }, + }) + .result.then(serviceName => { + core.removeService(serviceName); + $location.path('#!/new').replace(); + }); + }; - $scope.remove = function() { - $uibModal.open({ - templateUrl: removeTemplate, - controller: 'RemoveModalCtrl', - scope: $scope, - resolve: { - serviceName: () => $scope.service.name - } - }).result.then((serviceName) => { - core.removeService(serviceName); - $location.path('#!/new').replace(); - }); - }; - - $scope.rename = function() { - $uibModal.open({ - templateUrl: renameTemplate, - controller: 'RenameModalCtrl', - resolve: { - serviceName: () => $scope.service.name - } - }).result.then((serviceName) => { - core.renameService($scope.service.name, serviceName); - $location.path(`#!/service/${serviceName}/`).replace(); - }); - }; - - } + $scope.rename = function () { + $uibModal + .open({ + templateUrl: renameTemplate, + controller: 'RenameModalCtrl', + resolve: { + serviceName: () => $scope.service.name, + }, + }) + .result.then(serviceName => { + core.renameService($scope.service.name, serviceName); + $location.path(`#!/service/${serviceName}/`).replace(); + }); + }; + }, }));