Merge pull request #68 from bcgov/bugfix/circular-dep

Resolve circular build dependency
bcgov · Apr 6, 2023 · b457f2c · b457f2c
2 parents e39f922 + 57a3ea8
commit b457f2c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/frontend/src/components/object/ObjectFileDetails.vue b/frontend/src/components/object/ObjectFileDetails.vue
@@ -10,9 +10,9 @@ import {
   ObjectMetadata,
   ObjectPermission,
   ObjectProperties,
-  ObjectTag,
-  ShareObjectButton
+  ObjectTag
 } from '@/components/object';
+import { ShareObjectButton } from '@/components/object/share';
 import { Button, Dialog, useToast } from '@/lib/primevue';
 import { useAuthStore, useMetadataStore, useObjectStore, usePermissionStore, useTagStore } from '@/store';
 import { Permissions, RouteNames } from '@/utils/constants';

diff --git a/frontend/src/components/object/ObjectTable.vue b/frontend/src/components/object/ObjectTable.vue
@@ -5,9 +5,9 @@ import { ref, watch } from 'vue';
 import {
   DeleteObjectButton,
   DownloadObjectButton,
-  ObjectPermission,
-  ShareObjectButton
+  ObjectPermission
 } from '@/components/object';
+import { ShareObjectButton } from '@/components/object/share';
 import { Button, Column, DataTable, Dialog, FilterMatchMode, InputText, InputSwitch, useToast } from '@/lib/primevue';
 import { useAuthStore, useAppStore, useMetadataStore, useObjectStore, usePermissionStore } from '@/store';
 import { Permissions } from '@/utils/constants';

diff --git a/frontend/src/components/object/index.ts b/frontend/src/components/object/index.ts
@@ -12,5 +12,3 @@ export { default as ObjectTable } from './ObjectTable.vue';
 export { default as ObjectTag } from './ObjectTag.vue';
 export { default as ObjectUpload } from './ObjectUpload.vue';
 export { default as ObjectUploadFile } from './ObjectUploadFile.vue';
-export { default as ShareLinkContent } from './share/ShareLinkContent.vue';
-export { default as ShareObjectButton } from './share/ShareObjectButton.vue';
diff --git a/frontend/src/components/object/share/ShareObjectButton.vue b/frontend/src/components/object/share/ShareObjectButton.vue
@@ -3,7 +3,7 @@ import { storeToRefs } from 'pinia';
 import { computed, ref, onMounted } from 'vue';
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-import { ShareLinkContent } from '@/components/object';
+import ShareLinkContent from '@/components/object/share/ShareLinkContent.vue';
 import { Button, Dialog, TabView, TabPanel } from '@/lib/primevue';
 import { useConfigStore, useMetadataStore, useObjectStore } from '@/store';
 

diff --git a/frontend/src/components/object/share/index.ts b/frontend/src/components/object/share/index.ts
@@ -0,0 +1,2 @@
+export { default as ShareLinkContent } from './ShareLinkContent.vue';
+export { default as ShareObjectButton } from './ShareObjectButton.vue';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export { default as ShareLinkContent } from './ShareLinkContent.vue';
		export { default as ShareObjectButton } from './ShareObjectButton.vue';