From f12e602ab84f2a4ae28a064ed2058f57b9cf9bc3 Mon Sep 17 00:00:00 2001
From: Anna Tsyganova <ATSyganova@IBS.RU>
Date: Fri, 8 Jul 2022 11:32:33 +0300
Subject: Fix a little global components Issue: SILABMC-191

---
 .../SecurityAndAccess/Certificates/Certificates.vue  | 12 ++++++------
 .../Certificates/ModalGenerateCsr.vue                |  4 ++--
 .../Certificates/ModalUploadCertificate.vue          |  4 ++--
 src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue      | 16 +++++++++-------
 .../SecurityAndAccess/Ldap/ModalAddRoleGroup.vue     |  2 +-
 .../_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue | 12 ++++++------
 .../_sila/SecurityAndAccess/Policies/Policies.vue    |  6 +++---
 .../_sila/SecurityAndAccess/Sessions/Sessions.vue    | 20 ++++++++++----------
 .../UserManagement/ModalSettings.vue                 |  2 +-
 .../SecurityAndAccess/UserManagement/ModalUser.vue   |  6 +++---
 .../UserManagement/UserManagement.vue                | 12 ++++++------
 11 files changed, 49 insertions(+), 47 deletions(-)

(limited to 'src/views/_sila/SecurityAndAccess')

diff --git a/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue b/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue
index 0113b80a..27950b76 100644
--- a/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue
+++ b/src/views/_sila/SecurityAndAccess/Certificates/Certificates.vue
@@ -106,13 +106,13 @@ import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 
 import ModalGenerateCsr from './ModalGenerateCsr';
 import ModalUploadCertificate from './ModalUploadCertificate';
-import PageTitle from '@/components/Global/PageTitle';
-import TableRowAction from '@/components/Global/TableRowAction';
-import StatusIcon from '@/components/Global/StatusIcon';
-import Alert from '@/components/Global/Alert';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
+import StatusIcon from '@/components/_sila/Global/StatusIcon';
+import Alert from '@/components/_sila/Global/Alert';
 
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   name: 'Certificates',
diff --git a/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
index d76f9fe1..5bfb81b4 100644
--- a/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
+++ b/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
@@ -380,8 +380,8 @@ import { required, requiredIf } from 'vuelidate/lib/validators';
 
 import { COUNTRY_LIST } from './CsrCountryCodes';
 import { CERTIFICATE_TYPES } from '@/store/modules/SecurityAndAccess/CertificatesStore';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   name: 'ModalGenerateCsr',
diff --git a/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue b/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
index f4db7a26..5d58018f 100644
--- a/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
+++ b/src/views/_sila/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
@@ -70,9 +70,9 @@
 
 <script>
 import { required, requiredIf } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
-import FormFile from '@/components/Global/FormFile';
+import FormFile from '@/components/_sila/Global/FormFile';
 
 export default {
   components: { FormFile },
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
index 1f2108de..8374b653 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
@@ -234,13 +234,15 @@ import { mapGetters } from 'vuex';
 import { find } from 'lodash';
 import { requiredIf } from 'vuelidate/lib/validators';
 
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin';
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import InfoTooltip from '@/components/Global/InfoTooltip';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin';
+import LoadingBarMixin, {
+  loading,
+} from '@/components/_sila/Mixins/LoadingBarMixin';
+import InputPasswordToggle from '@/components/_sila/Global/InputPasswordToggle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import PageSection from '@/components/_sila/Global/PageSection';
+import InfoTooltip from '@/components/_sila/Global/InfoTooltip';
 import TableRoleGroups from './TableRoleGroups';
 
 export default {
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue b/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
index 6ea2561a..aa294ce3 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
@@ -81,7 +81,7 @@
 
 <script>
 import { required, requiredIf } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   mixins: [VuelidateMixin],
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue b/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue
index 5ae3e3d1..ca52da13 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/TableRoleGroups.vue
@@ -97,17 +97,17 @@ import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 import IconAdd from '@carbon/icons-vue/es/add--alt/20';
 import { mapGetters } from 'vuex';
 
-import Alert from '@/components/Global/Alert';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableRowAction from '@/components/Global/TableRowAction';
+import Alert from '@/components/_sila/Global/Alert';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import ModalAddRoleGroup from './ModalAddRoleGroup';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   components: {
diff --git a/src/views/_sila/SecurityAndAccess/Policies/Policies.vue b/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
index 1dc197c7..c594bde5 100644
--- a/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
+++ b/src/views/_sila/SecurityAndAccess/Policies/Policies.vue
@@ -109,10 +109,10 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 
 export default {
   name: 'Policies',
diff --git a/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue b/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
index 07ee725d..45579185 100644
--- a/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
+++ b/src/views/_sila/SecurityAndAccess/Sessions/Sessions.vue
@@ -114,27 +114,27 @@
 </template>
 
 <script>
-import PageTitle from '@/components/Global/PageTitle';
-import Search from '@/components/Global/Search';
-import TableCellCount from '@/components/Global/TableCellCount';
-import TableRowAction from '@/components/Global/TableRowAction';
-import TableToolbar from '@/components/Global/TableToolbar';
+import PageTitle from '@/components/_sila/Global/PageTitle';
+import Search from '@/components/_sila/Global/Search';
+import TableCellCount from '@/components/_sila/Global/TableCellCount';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
 
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 import BVPaginationMixin, {
   currentPage,
   perPage,
   itemsPerPageOptions,
-} from '@/components/Mixins/BVPaginationMixin';
+} from '@/components/_sila/Mixins/BVPaginationMixin';
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import SearchFilterMixin, {
   searchFilter,
-} from '@/components/Mixins/SearchFilterMixin';
+} from '@/components/_sila/Mixins/SearchFilterMixin';
 
 export default {
   components: {
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue b/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue
index 0f05123c..bbe3f53c 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/ModalSettings.vue
@@ -122,7 +122,7 @@
 </template>
 
 <script>
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 import {
   required,
   requiredIf,
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue b/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue
index 0f8757ce..c7aa56bb 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/ModalUser.vue
@@ -231,9 +231,9 @@ import {
   helpers,
   requiredIf,
 } from 'vuelidate/lib/validators';
-import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
-import InputPasswordToggle from '@/components/Global/InputPasswordToggle';
-import Alert from '@/components/Global/Alert';
+import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
+import InputPasswordToggle from '@/components/_sila/Global/InputPasswordToggle';
+import Alert from '@/components/_sila/Global/Alert';
 
 export default {
   components: { Alert, InputPasswordToggle },
diff --git a/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
index c6c556c8..423ce4c1 100644
--- a/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
+++ b/src/views/_sila/SecurityAndAccess/UserManagement/UserManagement.vue
@@ -121,18 +121,18 @@ import IconChevron from '@carbon/icons-vue/es/chevron--up/20';
 
 import ModalUser from './ModalUser';
 import ModalSettings from './ModalSettings';
-import PageTitle from '@/components/Global/PageTitle';
+import PageTitle from '@/components/_sila/Global/PageTitle';
 import TableRoles from './TableRoles';
-import TableToolbar from '@/components/Global/TableToolbar';
-import TableRowAction from '@/components/Global/TableRowAction';
+import TableToolbar from '@/components/_sila/Global/TableToolbar';
+import TableRowAction from '@/components/_sila/Global/TableRowAction';
 
 import BVTableSelectableMixin, {
   selectedRows,
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
-} from '@/components/Mixins/BVTableSelectableMixin';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+} from '@/components/_sila/Mixins/BVTableSelectableMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
+import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
 
 export default {
   name: 'UserManagement',
-- 
cgit v1.2.3