Merge pull request #134 from dinukadesilva/gh-131-enable-delete-confi…

…rmations gh-131: Refactoring
apache · Sep 2, 2021 · d39805e · d39805e
2 parents 7b13d07 + 413db43
commit d39805e
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "airavata-custos-portal",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": true,
   "main": "src/lib/index.js",
   "scripts": {

diff --git a/src/lib/components/block/entity-view/entity-view-secret.vue b/src/lib/components/block/entity-view/entity-view-secret.vue
@@ -89,8 +89,8 @@
 
 <script>
 import store from "../../../store";
-import ButtonView from "@/lib/components/button/button-view";
-import ButtonCopy from "@/lib/components/button/button-copy";
+import ButtonView from "../../button/button-view";
+import ButtonCopy from "../../button/button-copy";
 
 export default {
   name: "entity-view-secret",

diff --git a/src/lib/components/pages/ListTenants.vue b/src/lib/components/pages/ListTenants.vue
@@ -111,7 +111,7 @@ import TenantHome from "./TenantHome";
 import {custosService} from "../../store/util/custos.util";
 import TableOverlayInfo from "../overlay/table-overlay-info";
 import ButtonCopy from "../button/button-copy";
-import ButtonDeleteAfterConfirmation from "@/lib/components/button/button-delete-after-confirmation";
+import ButtonDeleteAfterConfirmation from "../button/button-delete-after-confirmation";
 
 export default {
   name: "ListTenants",

diff --git a/src/lib/components/pages/TenantEntities.vue b/src/lib/components/pages/TenantEntities.vue
@@ -126,10 +126,10 @@
 import store from "../../store"
 import TenantHome from "./TenantHome";
 import TableOverlayInfo from "../overlay/table-overlay-info";
-import ModalShareEntity from "@/lib/components/modals/modal-share-entity";
-import ButtonOverlay from "@/lib/components/overlay/button-overlay";
-import ButtonCopy from "@/lib/components/button/button-copy";
-import ButtonDeleteAfterConfirmation from "@/lib/components/button/button-delete-after-confirmation";
+import ModalShareEntity from "../modals/modal-share-entity";
+import ButtonOverlay from "../overlay/button-overlay";
+import ButtonCopy from "../button/button-copy";
+import ButtonDeleteAfterConfirmation from "../button/button-delete-after-confirmation";
 
 export default {
   name: "TenantEntities",

diff --git a/src/lib/components/pages/TenantEntityTypes.vue b/src/lib/components/pages/TenantEntityTypes.vue
@@ -44,7 +44,7 @@ import store from "../../store";
 import TableOverlayInfo from "../overlay/table-overlay-info";
 import ButtonOverlay from "../overlay/button-overlay";
 import ButtonCopy from "../button/button-copy";
-import ButtonDeleteAfterConfirmation from "@/lib/components/button/button-delete-after-confirmation";
+import ButtonDeleteAfterConfirmation from "../button/button-delete-after-confirmation";
 
 export default {
   name: "TenantEntityTypes",

diff --git a/src/lib/components/pages/TenantGroup.vue b/src/lib/components/pages/TenantGroup.vue
@@ -52,7 +52,7 @@ import TenantHome from "./TenantHome";
 import store from "../../store";
 import TableOverlayInfo from "../overlay/table-overlay-info";
 import ModalSelectUsersOrGroups from "../modals/modal-select-users-or-groups";
-import ButtonDeleteAfterConfirmation from "@/lib/components/button/button-delete-after-confirmation";
+import ButtonDeleteAfterConfirmation from "../button/button-delete-after-confirmation";
 
 export default {
   name: "TenantGroup",

diff --git a/src/lib/components/pages/TenantGroups.vue b/src/lib/components/pages/TenantGroups.vue
@@ -60,7 +60,7 @@ import TenantHome from "./TenantHome";
 import TableOverlayInfo from "../overlay/table-overlay-info";
 import ButtonOverlay from "../overlay/button-overlay";
 import ButtonCopy from "../button/button-copy";
-import ButtonDeleteAfterConfirmation from "@/lib/components/button/button-delete-after-confirmation";
+import ButtonDeleteAfterConfirmation from "../button/button-delete-after-confirmation";
 
 export default {
   name: "TenantGroups",

diff --git a/src/lib/components/pages/TenantPermissionTypes.vue b/src/lib/components/pages/TenantPermissionTypes.vue
@@ -44,7 +44,7 @@ import store from "../../store";
 import TableOverlayInfo from "../overlay/table-overlay-info";
 import ButtonOverlay from "../overlay/button-overlay";
 import ButtonCopy from "../button/button-copy";
-import ButtonDeleteAfterConfirmation from "@/lib/components/button/button-delete-after-confirmation";
+import ButtonDeleteAfterConfirmation from "../button/button-delete-after-confirmation";
 
 export default {
   name: "TenantPermissionTypes",

diff --git a/src/lib/components/pages/TenantRoles.vue b/src/lib/components/pages/TenantRoles.vue
@@ -58,7 +58,7 @@ import store from "../../store";
 import TableOverlayInfo from "../overlay/table-overlay-info";
 import ButtonOverlay from "../overlay/button-overlay";
 import ButtonCopy from "../button/button-copy";
-import ButtonDeleteAfterConfirmation from "@/lib/components/button/button-delete-after-confirmation";
+import ButtonDeleteAfterConfirmation from "../button/button-delete-after-confirmation";
 
 export default {
   name: "TenantRoles",

diff --git a/src/lib/components/pages/TenantUser.vue b/src/lib/components/pages/TenantUser.vue
@@ -154,7 +154,6 @@ import {
   VALIDATION_REGEX_FIRST_NAME,
   VALIDATION_REGEX_LAST_NAME
 } from "../../../components/validation-regex";
-// import TableOverlayInfo from "@/components/table-overlay-info";
 
 export default {
   name: "TenantUser",