From b5c93bbb841550bbb469d7482e383e426f74c6a4 Mon Sep 17 00:00:00 2001
From: Darren Satkunas <dsatkuna@akamai.com>
Date: Thu, 8 Dec 2022 10:03:44 -0800
Subject: [PATCH] move services

---
 .../src/components/new/BaseButtonService.vue  |  4 ++--
 .../new/BaseButtonSystemService.vue           |  4 ++--
 .../new}/BaseService.vue                      |  2 +-
 .../new}/BaseSystemService.vue                |  2 +-
 .../root/src/components/new/index.js          |  6 +++++
 .../pfappserver/root/src/globals/pfLocales.js | 22 ++++++++++++++++++-
 .../_components/BaseButtonBulkActions.vue     |  2 +-
 .../Status/services/_components/TheView.vue   |  4 ++--
 .../root/src/views/Status/services/config.js  | 19 ----------------
 9 files changed, 36 insertions(+), 29 deletions(-)
 rename html/pfappserver/root/src/{views/Status/services/_components => components/new}/BaseService.vue (99%)
 rename html/pfappserver/root/src/{views/Status/services/_components => components/new}/BaseSystemService.vue (99%)
 delete mode 100644 html/pfappserver/root/src/views/Status/services/config.js

diff --git a/html/pfappserver/root/src/components/new/BaseButtonService.vue b/html/pfappserver/root/src/components/new/BaseButtonService.vue
index 317dc0bfc600..f4539488b651 100644
--- a/html/pfappserver/root/src/components/new/BaseButtonService.vue
+++ b/html/pfappserver/root/src/components/new/BaseButtonService.vue
@@ -65,7 +65,7 @@
   </b-dropdown>
 </template>
 <script>
-import BaseService from '@/views/Status/services/_components/BaseService'
+import BaseService from './BaseService'
 
 const components = {
   BaseService
@@ -74,7 +74,7 @@ const components = {
 import { computed, nextTick, ref, toRefs, watch } from '@vue/composition-api'
 import acl from '@/utils/acl'
 import i18n from '@/utils/locale'
-import { localeStrings } from '@/views/Status/services/config'
+import { localeStrings } from '@/globals/pfLocales'
 
 const props = {
   service: {
diff --git a/html/pfappserver/root/src/components/new/BaseButtonSystemService.vue b/html/pfappserver/root/src/components/new/BaseButtonSystemService.vue
index 508992fe124a..bd01d5ffa811 100644
--- a/html/pfappserver/root/src/components/new/BaseButtonSystemService.vue
+++ b/html/pfappserver/root/src/components/new/BaseButtonSystemService.vue
@@ -57,7 +57,7 @@
   </b-dropdown>
 </template>
 <script>
-import BaseSystemService from '@/views/Status/services/_components/BaseSystemService'
+import BaseSystemService from './BaseSystemService'
 
 const components = {
   BaseSystemService
@@ -66,7 +66,7 @@ const components = {
 import { computed, nextTick, ref, toRefs, watch } from '@vue/composition-api'
 import acl from '@/utils/acl'
 import i18n from '@/utils/locale'
-import { localeStrings } from '@/views/Status/services/config'
+import { localeStrings } from '@/globals/pfLocales'
 
 const props = {
   service: {
diff --git a/html/pfappserver/root/src/views/Status/services/_components/BaseService.vue b/html/pfappserver/root/src/components/new/BaseService.vue
similarity index 99%
rename from html/pfappserver/root/src/views/Status/services/_components/BaseService.vue
rename to html/pfappserver/root/src/components/new/BaseService.vue
index b581fea9f97f..9cc75dc3637f 100644
--- a/html/pfappserver/root/src/views/Status/services/_components/BaseService.vue
+++ b/html/pfappserver/root/src/components/new/BaseService.vue
@@ -114,7 +114,7 @@ import { computed, toRefs, watch } from '@vue/composition-api'
 import { protectedServices } from '@/store/modules/cluster'
 import acl from '@/utils/acl'
 import i18n from '@/utils/locale'
-import { localeStrings } from '../config'
+import { localeStrings } from '@/globals/pfLocales'
 
 const setup = (props, context) => {
 
diff --git a/html/pfappserver/root/src/views/Status/services/_components/BaseSystemService.vue b/html/pfappserver/root/src/components/new/BaseSystemService.vue
similarity index 99%
rename from html/pfappserver/root/src/views/Status/services/_components/BaseSystemService.vue
rename to html/pfappserver/root/src/components/new/BaseSystemService.vue
index 2e8c3e46cd09..bc5e2280ebcc 100644
--- a/html/pfappserver/root/src/views/Status/services/_components/BaseSystemService.vue
+++ b/html/pfappserver/root/src/components/new/BaseSystemService.vue
@@ -81,7 +81,7 @@ const props = {
 import { computed, toRefs, watch } from '@vue/composition-api'
 import acl from '@/utils/acl'
 import i18n from '@/utils/locale'
-import { localeStrings } from '../config'
+import { localeStrings } from '@/globals/pfLocales'
 
 const setup = (props, context) => {
 
diff --git a/html/pfappserver/root/src/components/new/index.js b/html/pfappserver/root/src/components/new/index.js
index e3ebc55a7a05..26f7400be800 100644
--- a/html/pfappserver/root/src/components/new/index.js
+++ b/html/pfappserver/root/src/components/new/index.js
@@ -67,6 +67,8 @@ import BaseSearchInputAdvanced from './BaseSearchInputAdvanced'
 import BaseSearchInputColumns from './BaseSearchInputColumns'
 import BaseSearchInputLimit from './BaseSearchInputLimit'
 import BaseSearchInputPage from './BaseSearchInputPage'
+import BaseService from './BaseService'
+import BaseSystemService from './BaseSystemService'
 import BaseTableEmpty from './BaseTableEmpty'
 import BaseTableSortable from './BaseTableSortable'
 import BaseUpload from './BaseUpload'
@@ -165,6 +167,10 @@ export {
   BaseSearchInputLimit,
   BaseSearchInputPage,
 
+  // services
+  BaseService,
+  BaseSystemService,
+
   // tables
   BaseTableEmpty,
   BaseTableSortable,
diff --git a/html/pfappserver/root/src/globals/pfLocales.js b/html/pfappserver/root/src/globals/pfLocales.js
index a03b6d114883..7b08ac0d9f39 100644
--- a/html/pfappserver/root/src/globals/pfLocales.js
+++ b/html/pfappserver/root/src/globals/pfLocales.js
@@ -6,10 +6,30 @@ export const pfLocales = [
   'fr_FR',
   'he_IL',
   'it_IT',
-  'nb_NO',  
+  'nb_NO',
   'nl_NL',
   'pl_PL',
   'pt_BR'
 ]
 
 export const pfLocalesList = pfLocales.map(locale => { return { text: locale, value: locale } })
+
+export const localeStrings = {
+  SERVICES_DISABLED_SUCCESS: 'Disabled services {services}.', // i18n defer
+  SERVICES_DISABLED_ERROR: 'Failed to disable services {services}. See the server error logs for more information.', // i18n defer
+  SERVICES_PROTECTED_DISABLED_ERROR: 'Failed to disable services {services}. This service is required for this page to function and CLI access may be required to remediate any issues caused by the failure. See the server error logs for more information.', // i18n defer
+
+  SERVICES_ENABLED_SUCCESS: 'Enabled services {services}.', // i18n defer
+  SERVICES_ENABLED_ERROR: 'Failed to enable services {services}. See the server error logs for more information.', // i18n defer
+  SERVICES_PROTECTED_ENABLED_ERROR: 'Failed to enable services {services}. This service is required for this page to function and CLI access may be required to remediate any issues caused by the failure. See the server error logs for more information.', // i18n defer
+
+  SERVICES_RESTARTED_SUCCESS: 'Restarted services {services}.', // i18n defer
+  SERVICES_RESTARTED_ERROR: 'Failed to restart services {services}. See the server error logs for more information.', // i18n defer
+  SERVICES_PROTECTED_RESTARTED_ERROR: 'Failed to restart services {services}. This service is required for this page to function and CLI access may be required to remediate any issues caused by the failure. See the server error logs for more information.', // i18n defer
+
+  SERVICES_STARTED_SUCCESS: 'Started services {services}.', // i18n defer
+  SERVICES_STARTED_ERROR: 'Failed to start services {services}. See the server error logs for more information.', // i18n defer
+
+  SERVICES_STOPPED_SUCCESS: 'Stopped services {services}.', // i18n defer
+  SERVICES_STOPPED_ERROR: 'Failed to stop services {services}. See the server error logs for more information.', // i18n defer
+}
diff --git a/html/pfappserver/root/src/views/Status/services/_components/BaseButtonBulkActions.vue b/html/pfappserver/root/src/views/Status/services/_components/BaseButtonBulkActions.vue
index 827247c6224f..d49a4a78ded7 100644
--- a/html/pfappserver/root/src/views/Status/services/_components/BaseButtonBulkActions.vue
+++ b/html/pfappserver/root/src/views/Status/services/_components/BaseButtonBulkActions.vue
@@ -38,7 +38,7 @@ const props = {
 
 import { computed, nextTick, ref, toRefs } from '@vue/composition-api'
 import i18n from '@/utils/locale'
-import { localeStrings } from '../config'
+import { localeStrings } from '@/globals/pfLocales'
 
 const setup = (props, context) => {
 
diff --git a/html/pfappserver/root/src/views/Status/services/_components/TheView.vue b/html/pfappserver/root/src/views/Status/services/_components/TheView.vue
index a5cf7a1485c9..f724843d6a87 100644
--- a/html/pfappserver/root/src/views/Status/services/_components/TheView.vue
+++ b/html/pfappserver/root/src/views/Status/services/_components/TheView.vue
@@ -95,10 +95,10 @@
 
 <script>
 import {
+  BaseService,
   BaseTableEmpty
 } from '@/components/new/'
 import BaseButtonBulkActions from './BaseButtonBulkActions'
-import BaseService from './BaseService'
 
 const components = {
   BaseButtonBulkActions,
@@ -109,7 +109,7 @@ const components = {
 import { computed, customRef, onMounted, ref } from '@vue/composition-api'
 import { useBootstrapTableSelected } from '@/composables/useBootstrap'
 import i18n from '@/utils/locale'
-import { localeStrings } from '../config'
+import { localeStrings } from '@/globals/pfLocales'
 
 const setup = (props, context) => {
 
diff --git a/html/pfappserver/root/src/views/Status/services/config.js b/html/pfappserver/root/src/views/Status/services/config.js
deleted file mode 100644
index d81dd37139b5..000000000000
--- a/html/pfappserver/root/src/views/Status/services/config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export const localeStrings = {
-  SERVICES_DISABLED_SUCCESS: 'Disabled services {services}.', // i18n defer
-  SERVICES_DISABLED_ERROR: 'Failed to disable services {services}. See the server error logs for more information.', // i18n defer
-  SERVICES_PROTECTED_DISABLED_ERROR: 'Failed to disable services {services}. This service is required for this page to function and CLI access may be required to remediate any issues caused by the failure. See the server error logs for more information.', // i18n defer
-
-  SERVICES_ENABLED_SUCCESS: 'Enabled services {services}.', // i18n defer
-  SERVICES_ENABLED_ERROR: 'Failed to enable services {services}. See the server error logs for more information.', // i18n defer
-  SERVICES_PROTECTED_ENABLED_ERROR: 'Failed to enable services {services}. This service is required for this page to function and CLI access may be required to remediate any issues caused by the failure. See the server error logs for more information.', // i18n defer
-
-  SERVICES_RESTARTED_SUCCESS: 'Restarted services {services}.', // i18n defer
-  SERVICES_RESTARTED_ERROR: 'Failed to restart services {services}. See the server error logs for more information.', // i18n defer
-  SERVICES_PROTECTED_RESTARTED_ERROR: 'Failed to restart services {services}. This service is required for this page to function and CLI access may be required to remediate any issues caused by the failure. See the server error logs for more information.', // i18n defer
-
-  SERVICES_STARTED_SUCCESS: 'Started services {services}.', // i18n defer
-  SERVICES_STARTED_ERROR: 'Failed to start services {services}. See the server error logs for more information.', // i18n defer
-
-  SERVICES_STOPPED_SUCCESS: 'Stopped services {services}.', // i18n defer
-  SERVICES_STOPPED_ERROR: 'Failed to stop services {services}. See the server error logs for more information.', // i18n defer
-}
\ No newline at end of file