diff --git a/dashboard/src/components/PackageLocationCard.vue b/dashboard/src/components/PackageLocationCard.vue index 9d880ae2..6e889120 100644 --- a/dashboard/src/components/PackageLocationCard.vue +++ b/dashboard/src/components/PackageLocationCard.vue @@ -47,22 +47,35 @@ const choose = async () => { authStore.checkAttributes(['package:move']) " > - +
+ + +
diff --git a/dashboard/src/pages/ingest/sips/[id]/index.vue b/dashboard/src/pages/ingest/sips/[id]/index.vue index add8de22..ee061f11 100644 --- a/dashboard/src/pages/ingest/sips/[id]/index.vue +++ b/dashboard/src/pages/ingest/sips/[id]/index.vue @@ -29,11 +29,11 @@ const createAipWorkflow = computed(
-

AIP creation details

+

SIP details

Name
{{ packageStore.current.name }}
-
AIP UUID
+
UUID
Workflow status
@@ -62,10 +62,7 @@ const createAipWorkflow = computed(
-
- - -
+
diff --git a/dashboard/src/pages/ingest/sips/index.vue b/dashboard/src/pages/ingest/sips/index.vue index 3b9723da..693c6ab7 100644 --- a/dashboard/src/pages/ingest/sips/index.vue +++ b/dashboard/src/pages/ingest/sips/index.vue @@ -12,7 +12,7 @@ import { useAsyncState } from "@vueuse/core"; import { useAuthStore } from "@/stores/auth"; import { useLayoutStore } from "@/stores/layout"; import { usePackageStore } from "@/stores/package"; -import { useRoute, useRouter, type LocationQueryValue } from "vue-router/auto"; +import { useRoute, useRouter } from "vue-router/auto"; import { computed, ref, watch } from "vue"; // General icons. @@ -187,8 +187,8 @@ watch( ID Name UUID + Workflow Started - Location Status @@ -223,10 +223,8 @@ watch( + Create AIP {{ $filters.formatDateTime(pkg.startedAt) }} - - - @@ -329,7 +327,7 @@ watch(
- Showing packages {{ packageStore.page.offset + 1 }} - + Showing SIPs {{ packageStore.page.offset + 1 }} - {{ packageStore.lastResultOnPage }} of {{ packageStore.page.total }}
diff --git a/dashboard/src/pages/storage/aips/[id].vue b/dashboard/src/pages/storage/aips/[id].vue index 1fc7e893..b0c9488e 100644 --- a/dashboard/src/pages/storage/aips/[id].vue +++ b/dashboard/src/pages/storage/aips/[id].vue @@ -6,16 +6,16 @@ import { useAuthStore } from "@/stores/auth"; import { usePackageStore } from "@/stores/package"; import { useAsyncState } from "@vueuse/core"; import { useRoute, useRouter } from "vue-router/auto"; -import IconSIPs from "~icons/octicon/package-dependencies-24"; +import IconAIPs from "~icons/clarity/bundle-line"; import IconDetails from "~icons/clarity/details-line?raw&font-size=20px"; -const route = useRoute("/ingest/sips/[id]"); +const route = useRoute("/storage/aips/[id]"); const router = useRouter(); const authStore = useAuthStore(); const packageStore = usePackageStore(); const { execute, error } = useAsyncState( - packageStore.fetchCurrent(route.params.id.toString()), + packageStore.fetchCurrent(route.params.id.toString(), true), null, ); @@ -24,10 +24,10 @@ const tabs = [ icon: IconDetails, text: "Summary", route: router.resolve({ - name: "/ingest/sips/[id]/", + name: "/storage/aips/[id]/", params: { id: route.params.id }, }), - show: authStore.checkAttributes(["package:read"]), + show: authStore.checkAttributes(["storage:aip:read"]), }, ]; @@ -39,7 +39,7 @@ const tabs = [

- {{ packageStore.current.name }} + {{ packageStore.current.name }}

diff --git a/dashboard/src/pages/storage/aips/[id]/index.vue b/dashboard/src/pages/storage/aips/[id]/index.vue index add8de22..d12b6d2c 100644 --- a/dashboard/src/pages/storage/aips/[id]/index.vue +++ b/dashboard/src/pages/storage/aips/[id]/index.vue @@ -1,6 +1,5 @@