From ff584a3b2e91b96594c3b1a48992c54089e6257a Mon Sep 17 00:00:00 2001
From: Marlen Brunner <klondikemarlen@gmail.com>
Date: Fri, 17 Apr 2026 12:22:06 -0700
Subject: [PATCH 01/25] :bug: Fix editor bridge shutdown to kill entire process
 group

Use negative PID to kill entire process group instead of just parent
process. Ensures bridge can be properly shut down when spawned with
pgroup: true.
---
 bin/open-in-editor-bridge.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 bin/open-in-editor-bridge.rb

diff --git a/bin/open-in-editor-bridge.rb b/bin/open-in-editor-bridge.rb
old mode 100644
new mode 100755
index 503200bc..b9ad63e3
--- a/bin/open-in-editor-bridge.rb
+++ b/bin/open-in-editor-bridge.rb
@@ -81,7 +81,7 @@ def shutdown
 
     return unless pid
 
-    Process.kill("TERM", pid)
+    Process.kill("TERM", -pid)
     delete_pid_file
 
     puts "Stopped editor bridge."

From cc1b9d575c1457e31084bbff21def01f67f92262 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Tue, 2 Jun 2026 12:39:18 -0700
Subject: [PATCH 02/25] `access_level_department_restriction` key in template
 `api/src/templates/information-sharing-agreements/confidentiality-acknowledgement-template.docx`
 was not being populated by
 `api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts`

---
 .../create-serializer.ts                                        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts b/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts
index fe6b5752..013951d4 100644
--- a/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts
+++ b/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts
@@ -36,6 +36,7 @@ export type InformationSharingAgreementAsConfidentialityAcknowledgement = {
   "access_level.is_internal": boolean
   "access_level.is_protected_and_limited": boolean
   "access_level.is_confidential_and_restricted": boolean
+  access_level_department_restriction: string
   department_branch_unit_hierarchy: string
   has_additional_access_restrictions: boolean
   additional_access_restrictions: string
@@ -128,6 +129,7 @@ export class CreateSerializer extends BaseSerializer<InformationSharingAgreement
       "access_level.is_internal": isInternal,
       "access_level.is_protected_and_limited": isProtectedAndLimited,
       "access_level.is_confidential_and_restricted": isConfidentialAndRestricted,
+      access_level_department_restriction: this.record.accessLevelDepartmentRestriction ?? "undefined",
       department_branch_unit_hierarchy: departmentBranchUnitHierarchy,
       has_additional_access_restrictions: this.record.hasAdditionalAccessRestrictions ?? false,
       additional_access_restrictions: this.record.additionalAccessRestrictions ?? "",

From 5816eadf7bdda2690e9e0ea71ac16fc120ea9ad8 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Tue, 2 Jun 2026 14:21:18 -0700
Subject: [PATCH 03/25] make string empty

---
 .../create-serializer.ts                                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts b/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts
index 013951d4..022efad5 100644
--- a/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts
+++ b/api/src/serializers/information-sharing-agreements/generate-confidentiality-acknowledgement/create-serializer.ts
@@ -129,7 +129,7 @@ export class CreateSerializer extends BaseSerializer<InformationSharingAgreement
       "access_level.is_internal": isInternal,
       "access_level.is_protected_and_limited": isProtectedAndLimited,
       "access_level.is_confidential_and_restricted": isConfidentialAndRestricted,
-      access_level_department_restriction: this.record.accessLevelDepartmentRestriction ?? "undefined",
+      access_level_department_restriction: this.record.accessLevelDepartmentRestriction ?? "",
       department_branch_unit_hierarchy: departmentBranchUnitHierarchy,
       has_additional_access_restrictions: this.record.hasAdditionalAccessRestrictions ?? false,
       additional_access_restrictions: this.record.additionalAccessRestrictions ?? "",

From 719c4025aff81631e2d343894893ae2f608ebc00 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Thu, 4 Jun 2026 15:30:58 -0700
Subject: [PATCH 04/25] external user edit form

---
 .../components/users/UserExternalEditForm.vue | 216 ++++++++++++++++++
 .../users/UsersEditDataTableServer.vue        |  15 +-
 web/src/pages/users/UserExternalEditPage.vue  |  35 +++
 web/src/routes.ts                             |   6 +
 4 files changed, 269 insertions(+), 3 deletions(-)
 create mode 100644 web/src/components/users/UserExternalEditForm.vue
 create mode 100644 web/src/pages/users/UserExternalEditPage.vue

diff --git a/web/src/components/users/UserExternalEditForm.vue b/web/src/components/users/UserExternalEditForm.vue
new file mode 100644
index 00000000..34b25d7e
--- /dev/null
+++ b/web/src/components/users/UserExternalEditForm.vue
@@ -0,0 +1,216 @@
+<template>
+  <v-skeleton-loader
+    v-if="isNil(user)"
+    type="card"
+  />
+  <v-form
+    v-else
+    ref="form"
+    @submit.prevent="saveWrapper"
+  >
+    <v-card class="border">
+      <v-card-title>External User Details</v-card-title>
+      <v-card-text>
+        <v-row>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <v-text-field
+              v-model="user.email"
+              label="Email *"
+              :rules="[required]"
+              required
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <ExternalOrganizationSearchableAutocomplete
+              v-model="user.externalOrganizationId"
+              label="Yukon First Nation *"
+              :rules="[required]"
+              required
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <v-text-field
+              v-model="user.firstName"
+              label="First name *"
+              :rules="[required]"
+              required
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <v-text-field
+              v-model="user.lastName"
+              label="Last name *"
+              :rules="[required]"
+              required
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <v-text-field
+              v-model="user.displayName"
+              label="Display Name"
+              required
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <v-text-field
+              v-model="user.title"
+              label="Title"
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <v-text-field
+              v-model="user.phoneNumber"
+              label="Phone Number"
+            />
+          </v-col>
+        </v-row>
+      </v-card-text>
+
+      <v-card-text>
+        <v-row>
+          <v-col class="d-flex justify-end">
+            <v-btn
+              :loading="isLoading"
+              color="secondary"
+              variant="outlined"
+              v-bind="cancelButtonOptions"
+            >
+              Cancel
+            </v-btn>
+            <v-spacer />
+            <v-btn
+              v-if="policy?.update"
+              class="ml-3"
+              :loading="isLoading"
+              color="primary"
+              variant="outlined"
+              @click="sync"
+            >
+              <v-icon class="mr-2">mdi-sync</v-icon>
+              Sync
+            </v-btn>
+            <v-btn
+              class="ml-3"
+              :loading="isLoading"
+              type="submit"
+              color="primary"
+            >
+              Save
+            </v-btn>
+          </v-col>
+        </v-row>
+      </v-card-text>
+    </v-card>
+  </v-form>
+</template>
+
+<script setup lang="ts">
+import { isNil } from "lodash"
+import { ref, toRefs } from "vue"
+
+import { type VBtn, type VForm } from "vuetify/components"
+
+import { required } from "@/utils/validators"
+import usersApi from "@/api/users-api"
+
+import useCurrentUser from "@/use/use-current-user"
+import useSnack from "@/use/use-snack"
+import useUser from "@/use/use-user"
+
+type CancelButtonOptions = VBtn["$props"]
+
+const props = withDefaults(
+  defineProps<{
+    userId: number
+    cancelButtonOptions?: CancelButtonOptions
+  }>(),
+  {
+    cancelButtonOptions: ({ userId }) => ({
+      to: {
+        name: "UserPage",
+        params: { userId },
+      },
+    }),
+  }
+)
+
+const emit = defineEmits<{
+  saved: [userId: number]
+}>()
+
+const { userId } = toRefs(props)
+const { user, policy, isLoading, save, refresh: refreshUser } = useUser(userId)
+
+const form = ref<InstanceType<typeof VForm> | null>(null)
+const snack = useSnack()
+const { currentUser, refresh: refreshCurrentUser } = useCurrentUser<true>()
+
+async function saveWrapper() {
+  if (isNil(user.value)) return
+  if (isNil(form.value)) return
+
+  const { valid } = await form.value.validate()
+  if (!valid) return
+
+  try {
+    await save()
+
+    if (user.value.id === currentUser.value.id) {
+      await refreshCurrentUser()
+      snack.info("Saved and reloaded current user!")
+    } else {
+      snack.success("User saved!")
+    }
+
+    emit("saved", user.value.id)
+  } catch (error) {
+    console.error(`Failed to save user: ${error}`, { error })
+    snack.error(`Failed to save user: ${error}`)
+  }
+}
+
+async function sync() {
+  if (isNil(user.value)) return
+
+  isLoading.value = true
+  try {
+    await usersApi.directorySync(user.value.id)
+
+    if (user.value.id === currentUser.value.id) {
+      await refreshCurrentUser()
+      snack.info("Synced and reloaded current user!")
+    } else {
+      await refreshUser()
+      snack.success("User synced!")
+    }
+
+    emit("saved", user.value.id)
+  } catch (error) {
+    console.error(`Failed to sync user: ${error}`, { error })
+    snack.error(`Failed to sync user: ${error}`)
+  } finally {
+    isLoading.value = false
+  }
+}
+</script>
diff --git a/web/src/components/users/UsersEditDataTableServer.vue b/web/src/components/users/UsersEditDataTableServer.vue
index a670651c..d47a9431 100644
--- a/web/src/components/users/UsersEditDataTableServer.vue
+++ b/web/src/components/users/UsersEditDataTableServer.vue
@@ -7,7 +7,7 @@
     :items="users"
     :items-length="totalCount"
     :loading="isLoading"
-    @click:row="(_event: unknown, { item }: UserTableRow) => goToUserEditPage(item.id)"
+    @click:row="(_event: unknown, { item }: UserTableRow) => goToUserEditPage(item)"
   >
     <template #item.displayName="{ item }">
       <UserAttributesAvatarCard
@@ -179,11 +179,20 @@ const { isSystemAdmin } = useCurrentUser()
 
 const router = useRouter()
 
-function goToUserEditPage(userId: number) {
+function goToUserEditPage(user: UserAsIndex) {
+  if (user.isExternal) {
+    return router.push({
+      name: "users/UserExternalEditPage",
+      params: {
+        userId: user.id,
+      },
+    })
+  }
+
   return router.push({
     name: "users/UserEditPage",
     params: {
-      userId,
+      userId: user.id,
     },
   })
 }
diff --git a/web/src/pages/users/UserExternalEditPage.vue b/web/src/pages/users/UserExternalEditPage.vue
new file mode 100644
index 00000000..c76bb9ab
--- /dev/null
+++ b/web/src/pages/users/UserExternalEditPage.vue
@@ -0,0 +1,35 @@
+<template>
+  <v-skeleton-loader v-if="isNil(user)" />
+  <div v-else>
+    <UserExternalEditForm
+      :user-id="user.id"
+      :cancel-button-options="{ to: { name: 'users/UsersPage' } }"
+      @saved="refresh"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from "vue"
+import { isNil } from "lodash"
+
+import useBreadcrumbs, { ADMIN_CRUMB } from "@/use/use-breadcrumbs"
+import useUser from "@/use/use-user"
+
+import UserExternalEditForm from "@/components/users/UserExternalEditForm.vue"
+
+const props = defineProps<{
+  userId: string
+}>()
+
+const userId = computed(() => parseInt(props.userId))
+const { user, refresh } = useUser(userId)
+
+useBreadcrumbs("Edit External User", [
+  ADMIN_CRUMB,
+  {
+    title: "Users",
+    to: { name: "users/UsersPage" },
+  },
+])
+</script>
diff --git a/web/src/routes.ts b/web/src/routes.ts
index ac9ff946..89995cc3 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -288,6 +288,12 @@ const routes: RouteRecordRaw[] = [
             component: () => import("@/pages/users/UserEditPage.vue"),
             props: true,
           },
+          {
+            path: "external-users/:userId/edit",
+            name: "users/UserExternalEditPage",
+            component: () => import("@/pages/users/UserExternalEditPage.vue"),
+            props: true,
+          },
         ],
       },
       {

From 45395f47eed613bea3a2f13da8f8981454f46b1d Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Thu, 4 Jun 2026 18:28:58 -0700
Subject: [PATCH 05/25] updating route names

---
 ...mationSharingAgreementAccessGrantEditDataTableServer.vue | 2 +-
 .../InformationSharingAgreementAccessGrantsDataIterator.vue | 2 +-
 .../user-groups/UserGroupsAsUsersEditDataTableServer.vue    | 2 +-
 web/src/components/users/UserChip.vue                       | 2 +-
 .../users/{UserEditForm.vue => UserInternalEditForm.vue}    | 0
 web/src/components/users/UsersEditDataTableServer.vue       | 2 +-
 web/src/pages/ProfilePage.vue                               | 4 ++--
 .../users/{UserEditPage.vue => UserInternalEditPage.vue}    | 4 ++--
 web/src/routes.ts                                           | 6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename web/src/components/users/{UserEditForm.vue => UserInternalEditForm.vue} (100%)
 rename web/src/pages/users/{UserEditPage.vue => UserInternalEditPage.vue} (86%)

diff --git a/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantEditDataTableServer.vue b/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantEditDataTableServer.vue
index bb03391e..9355d29b 100644
--- a/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantEditDataTableServer.vue
+++ b/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantEditDataTableServer.vue
@@ -142,7 +142,7 @@ const router = useRouter()
 function goToUserPage(userId: number) {
   // TODO: standardize this route to redirect to user read page (once a read page exists)
   return router.push({
-    name: "users/UserEditPage",
+    name: "users/UserInternalEditPage",
     params: {
       userId,
     },
diff --git a/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantsDataIterator.vue b/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantsDataIterator.vue
index b5dedf90..4e8c42f1 100644
--- a/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantsDataIterator.vue
+++ b/web/src/components/information-sharing-agreement-access-grants/InformationSharingAgreementAccessGrantsDataIterator.vue
@@ -87,7 +87,7 @@ const router = useRouter()
 function goToUserPage(userId: number) {
   // TODO: standardize this route to redirect to user read page
   return router.push({
-    name: "users/UserEditPage",
+    name: "users/UserInternalEditPage",
     params: {
       userId,
     },
diff --git a/web/src/components/user-groups/UserGroupsAsUsersEditDataTableServer.vue b/web/src/components/user-groups/UserGroupsAsUsersEditDataTableServer.vue
index 7256a7c8..000931b2 100644
--- a/web/src/components/user-groups/UserGroupsAsUsersEditDataTableServer.vue
+++ b/web/src/components/user-groups/UserGroupsAsUsersEditDataTableServer.vue
@@ -129,7 +129,7 @@ const router = useRouter()
 function goToUserPage(userId: number) {
   // TODO: standardize this route to redirect to user read page
   return router.push({
-    name: "users/UserEditPage",
+    name: "users/UserInternalEditPage",
     params: {
       userId,
     },
diff --git a/web/src/components/users/UserChip.vue b/web/src/components/users/UserChip.vue
index a0a268b7..1c3adfb1 100644
--- a/web/src/components/users/UserChip.vue
+++ b/web/src/components/users/UserChip.vue
@@ -160,7 +160,7 @@ const userProfileLink = computed(() => {
 
   if (isSystemAdmin.value) {
     return {
-      name: "users/UserEditPage",
+      name: "users/UserInternalEditPage",
       params: {
         userId: userId.value,
       },
diff --git a/web/src/components/users/UserEditForm.vue b/web/src/components/users/UserInternalEditForm.vue
similarity index 100%
rename from web/src/components/users/UserEditForm.vue
rename to web/src/components/users/UserInternalEditForm.vue
diff --git a/web/src/components/users/UsersEditDataTableServer.vue b/web/src/components/users/UsersEditDataTableServer.vue
index d47a9431..e97ace81 100644
--- a/web/src/components/users/UsersEditDataTableServer.vue
+++ b/web/src/components/users/UsersEditDataTableServer.vue
@@ -190,7 +190,7 @@ function goToUserEditPage(user: UserAsIndex) {
   }
 
   return router.push({
-    name: "users/UserEditPage",
+    name: "users/UserInternalEditPage",
     params: {
       userId: user.id,
     },
diff --git a/web/src/pages/ProfilePage.vue b/web/src/pages/ProfilePage.vue
index 25a93ad5..6d211ca4 100644
--- a/web/src/pages/ProfilePage.vue
+++ b/web/src/pages/ProfilePage.vue
@@ -16,7 +16,7 @@
       </div>
     </div>
 
-    <UserEditForm
+    <UserInternalEditForm
       class="mt-10"
       :user-id="currentUser.id"
       :cancel-button-options="{
@@ -35,7 +35,7 @@ import { isNil } from "lodash"
 import useBreadcrumbs from "@/use/use-breadcrumbs"
 import useCurrentUser from "@/use/use-current-user"
 
-import UserEditForm from "@/components/users/UserEditForm.vue"
+import UserInternalEditForm from "@/components/users/UserInternalEditForm.vue"
 
 const { currentUser, refresh } = useCurrentUser<true>()
 
diff --git a/web/src/pages/users/UserEditPage.vue b/web/src/pages/users/UserInternalEditPage.vue
similarity index 86%
rename from web/src/pages/users/UserEditPage.vue
rename to web/src/pages/users/UserInternalEditPage.vue
index 88d920e6..54f04a9a 100644
--- a/web/src/pages/users/UserEditPage.vue
+++ b/web/src/pages/users/UserInternalEditPage.vue
@@ -1,7 +1,7 @@
 <template>
   <v-skeleton-loader v-if="isNil(user)" />
   <div v-else>
-    <UserEditForm
+    <UserInternalEditForm
       :user-id="user.id"
       :cancel-button-options="{ to: { name: 'users/UsersPage' } }"
       @saved="refresh"
@@ -16,7 +16,7 @@ import { isNil } from "lodash"
 import useBreadcrumbs, { ADMIN_CRUMB } from "@/use/use-breadcrumbs"
 import useUser from "@/use/use-user"
 
-import UserEditForm from "@/components/users/UserEditForm.vue"
+import UserInternalEditForm from "@/components/users/UserInternalEditForm.vue"
 
 const props = defineProps<{
   userId: string
diff --git a/web/src/routes.ts b/web/src/routes.ts
index 89995cc3..5b86ca27 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -283,9 +283,9 @@ const routes: RouteRecordRaw[] = [
             props: true,
           },
           {
-            path: "users/:userId/edit",
-            name: "users/UserEditPage",
-            component: () => import("@/pages/users/UserEditPage.vue"),
+            path: "internal-users/:userId/edit",
+            name: "users/UserInternalEditPage",
+            component: () => import("@/pages/users/UserInternalEditPage.vue"),
             props: true,
           },
           {

From 3b49956b9b5b2fdb3938f5ab06d846c50bbc917a Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Thu, 4 Jun 2026 18:31:12 -0700
Subject: [PATCH 06/25] Added back in slider components

---
 .../components/users/UserExternalEditForm.vue | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/web/src/components/users/UserExternalEditForm.vue b/web/src/components/users/UserExternalEditForm.vue
index 34b25d7e..ce14422c 100644
--- a/web/src/components/users/UserExternalEditForm.vue
+++ b/web/src/components/users/UserExternalEditForm.vue
@@ -84,6 +84,35 @@
               label="Phone Number"
             />
           </v-col>
+          <v-col
+            v-if="isSystemAdmin"
+            cols="12"
+            md="3"
+          >
+            <UserAccountActivationSwitch
+              :user-id="user.id"
+              :is-active="isNil(user.deactivatedAt)"
+              :disabled="user.id === currentUser.id"
+              @success="refresh"
+            />
+            <v-tooltip
+              v-if="user.id === currentUser.id"
+              activator="parent"
+            >
+              <span>You cannot change account activation of current user.</span>
+            </v-tooltip>
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <v-switch
+              v-model="user.emailNotificationsEnabled"
+              label="Receive email notifications"
+              :false-value="false"
+              :true-value="true"
+            />
+          </v-col>
         </v-row>
       </v-card-text>
 
@@ -138,6 +167,8 @@ import useCurrentUser from "@/use/use-current-user"
 import useSnack from "@/use/use-snack"
 import useUser from "@/use/use-user"
 
+import UserAccountActivationSwitch from "@/components/users/UserAccountActivationSwitch.vue"
+
 type CancelButtonOptions = VBtn["$props"]
 
 const props = withDefaults(
@@ -164,7 +195,7 @@ const { user, policy, isLoading, save, refresh: refreshUser } = useUser(userId)
 
 const form = ref<InstanceType<typeof VForm> | null>(null)
 const snack = useSnack()
-const { currentUser, refresh: refreshCurrentUser } = useCurrentUser<true>()
+const { currentUser, isSystemAdmin, refresh: refreshCurrentUser } = useCurrentUser<true>()
 
 async function saveWrapper() {
   if (isNil(user.value)) return
@@ -190,6 +221,14 @@ async function saveWrapper() {
   }
 }
 
+async function refresh() {
+  await refreshUser()
+
+  if (user.value?.id === currentUser.value.id) {
+    await refreshCurrentUser()
+  }
+}
+
 async function sync() {
   if (isNil(user.value)) return
 

From 69ba248e5710346e2e9265022a3d432e2a1f6aa2 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Tue, 16 Jun 2026 12:27:56 -0700
Subject: [PATCH 07/25] chopping out new and edit pages for admin ISA

---
 ...formationSharingAgreementAdminEditForm.vue | 147 ------------------
 .../InformationSharingAgreementCard.vue       |   2 +-
 ...ringAgreementsAdminEditDataTableServer.vue |   2 +-
 .../InformationSharingAgreementsPage.vue      |   2 +-
 .../InformationSharingAgreementEditPage.vue   |  31 ----
 .../InformationSharingAgreementNewPage.vue    |  18 ---
 .../InformationSharingAgreementPage.vue       |   2 +-
 web/src/routes.ts                             |  13 --
 8 files changed, 4 insertions(+), 213 deletions(-)
 delete mode 100644 web/src/components/information-sharing-agreements/InformationSharingAgreementAdminEditForm.vue
 delete mode 100644 web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementEditPage.vue
 delete mode 100644 web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementNewPage.vue

diff --git a/web/src/components/information-sharing-agreements/InformationSharingAgreementAdminEditForm.vue b/web/src/components/information-sharing-agreements/InformationSharingAgreementAdminEditForm.vue
deleted file mode 100644
index bd2605db..00000000
--- a/web/src/components/information-sharing-agreements/InformationSharingAgreementAdminEditForm.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
-  <v-skeleton-loader
-    v-if="isNil(informationSharingAgreement)"
-    type="card@4"
-  />
-  <v-form
-    v-else
-    ref="form"
-    @submit.prevent="saveWrapper"
-  >
-    <v-row class="mt-2">
-      <v-col>
-        <InformationSharingAgreementBasicInformationEditCard
-          v-model:title="informationSharingAgreement.title"
-          v-model:purpose="informationSharingAgreement.purpose"
-          v-model:external-group-contact-id="informationSharingAgreement.externalGroupContactId"
-          v-model:external-group-contact-title="informationSharingAgreement.externalGroupContactTitle"
-          v-model:internal-group-contact-id="informationSharingAgreement.internalGroupContactId"
-          v-model:internal-group-contact-title="
-            informationSharingAgreement.internalGroupContactTitle
-          "
-          v-model:internal-group-secondary-contact-id="
-            informationSharingAgreement.internalGroupSecondaryContactId
-          "
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col>
-        <InformationSharingAgreementDurationEditCard
-          v-model:end-date="informationSharingAgreement.endDate"
-          v-model:expiration-condition="informationSharingAgreement.expirationCondition"
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col cols="12">
-        <InformationSharingAgreementAccessEditCard
-          v-model:access-level="informationSharingAgreement.accessLevel"
-          v-model:access-level-department-restriction="
-            informationSharingAgreement.accessLevelDepartmentRestriction
-          "
-          v-model:access-level-branch-restriction="
-            informationSharingAgreement.accessLevelBranchRestriction
-          "
-          v-model:access-level-unit-restriction="
-            informationSharingAgreement.accessLevelUnitRestriction
-          "
-          v-model:has-additional-access-restrictions="
-            informationSharingAgreement.hasAdditionalAccessRestrictions
-          "
-          v-model:additional-access-restrictions="
-            informationSharingAgreement.additionalAccessRestrictions
-          "
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col cols="12">
-        <InformationSharingAgreementConfidentialityEditCard
-          v-model:confidentiality-type="informationSharingAgreement.confidentialityType"
-          v-model:authorized-application="informationSharingAgreement.authorizedApplication"
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col class="d-flex justify-end">
-        <v-btn
-          :loading="isLoading"
-          color="secondary"
-          variant="outlined"
-          :to="{
-            name: 'administration/InformationSharingAgreementsPage',
-          }"
-        >
-          Cancel
-        </v-btn>
-        <v-spacer />
-        <v-btn
-          class="ml-3"
-          :loading="isLoading"
-          type="submit"
-          color="primary"
-        >
-          Save
-        </v-btn>
-      </v-col>
-    </v-row>
-  </v-form>
-</template>
-
-<script setup lang="ts">
-import { toRefs, useTemplateRef } from "vue"
-import { isNil } from "lodash"
-
-import useInformationSharingAgreement from "@/use/use-information-sharing-agreement"
-import useSnack from "@/use/use-snack"
-
-import InformationSharingAgreementAccessEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementAccessEditCard.vue"
-import InformationSharingAgreementBasicInformationEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementBasicInformationEditCard.vue"
-import InformationSharingAgreementConfidentialityEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementConfidentialityEditCard.vue"
-import InformationSharingAgreementDurationEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementDurationEditCard.vue"
-
-const props = defineProps<{
-  informationSharingAgreementId: number
-}>()
-
-const emit = defineEmits<{
-  saved: [informationSharingAgreementId: number]
-}>()
-
-const { informationSharingAgreementId } = toRefs(props)
-const { informationSharingAgreement, save, isLoading } = useInformationSharingAgreement(
-  informationSharingAgreementId
-)
-
-const snack = useSnack()
-const form = useTemplateRef("form")
-
-async function saveWrapper() {
-  if (isNil(informationSharingAgreement.value)) return
-  if (isNil(form.value)) return
-
-  const { valid } = await form.value.validate()
-  if (!valid) {
-    snack.error("Please fill out all required fields")
-    return
-  }
-
-  try {
-    await save()
-    snack.success("Information Sharing Agreement updated.")
-    emit("saved", props.informationSharingAgreementId)
-  } catch (error) {
-    console.error(`Failed to update information sharing agreement: ${error}`, { error })
-    snack.error(`Failed to update information sharing agreement: ${error}`)
-  }
-}
-</script>
diff --git a/web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue b/web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue
index 4b73f156..eddec2cb 100644
--- a/web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue
+++ b/web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue
@@ -204,7 +204,7 @@ const props = withDefaults(
     }),
     editButtonProps: ({ informationSharingAgreementId }) => ({
       to: {
-        name: "administration/information-sharing-agreements/InformationSharingAgreementEditPage",
+        name: "information-sharing-agreements/InformationSharingAgreementEditPage",
         params: {
           informationSharingAgreementId,
         },
diff --git a/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue b/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue
index efe1478f..cda0ec44 100644
--- a/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue
+++ b/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue
@@ -38,7 +38,7 @@
         <v-btn
           v-if="item.policy.update"
           :to="{
-            name: 'administration/information-sharing-agreements/InformationSharingAgreementEditPage',
+            name: 'information-sharing-agreements/InformationSharingAgreementEditPage',
             params: {
               informationSharingAgreementId: item.id,
             },
diff --git a/web/src/pages/administration/InformationSharingAgreementsPage.vue b/web/src/pages/administration/InformationSharingAgreementsPage.vue
index a1ee8cb2..5cecff94 100644
--- a/web/src/pages/administration/InformationSharingAgreementsPage.vue
+++ b/web/src/pages/administration/InformationSharingAgreementsPage.vue
@@ -11,7 +11,7 @@
           v-if="isSystemAdmin || isExternalGroupAdmin"
           color="primary"
           :to="{
-            name: 'administration/information-sharing-agreements/InformationSharingAgreementNewPage',
+            name: 'information-sharing-agreements/InformationSharingAgreementNewPage',
           }"
           style="height: 40px"
         >
diff --git a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementEditPage.vue b/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementEditPage.vue
deleted file mode 100644
index f75fba3a..00000000
--- a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementEditPage.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <InformationSharingAgreementAdminEditForm
-    :information-sharing-agreement-id="informationSharingAgreementIdAsNumber"
-  />
-</template>
-
-<script setup lang="ts">
-import { computed } from "vue"
-
-import useBreadcrumbs, { ADMIN_CRUMB } from "@/use/use-breadcrumbs"
-
-import InformationSharingAgreementAdminEditForm from "@/components/information-sharing-agreements/InformationSharingAgreementAdminEditForm.vue"
-
-const props = defineProps<{
-  informationSharingAgreementId: string
-}>()
-
-const informationSharingAgreementIdAsNumber = computed(() =>
-  parseInt(props.informationSharingAgreementId)
-)
-
-useBreadcrumbs("Edit Information Sharing Agreement", [
-  ADMIN_CRUMB,
-  {
-    title: "Information Sharing Agreements",
-    to: {
-      name: "administration/InformationSharingAgreementsPage",
-    },
-  },
-])
-</script>
diff --git a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementNewPage.vue b/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementNewPage.vue
deleted file mode 100644
index 5b4ec80f..00000000
--- a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementNewPage.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <InformationSharingAgreementAdminCreateForm />
-</template>
-
-<script setup lang="ts">
-import useBreadcrumbs, { ADMIN_CRUMB } from "@/use/use-breadcrumbs"
-import InformationSharingAgreementAdminCreateForm from "@/components/information-sharing-agreements/InformationSharingAgreementAdminCreateForm.vue"
-
-useBreadcrumbs("New Information Sharing Agreement", [
-  ADMIN_CRUMB,
-  {
-    title: "Information Sharing Agreements",
-    to: {
-      name: "administration/InformationSharingAgreementsPage",
-    },
-  },
-])
-</script>
diff --git a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue b/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue
index bceb9bfd..81e362c8 100644
--- a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue
+++ b/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue
@@ -59,7 +59,7 @@ const returnToHref = computed(() => {
 
 const editButtonProps = computed(() => ({
   to: {
-    name: "administration/information-sharing-agreements/InformationSharingAgreementEditPage",
+    name: "information-sharing-agreements/InformationSharingAgreementEditPage",
     params: {
       informationSharingAgreementId: props.informationSharingAgreementId,
     },
diff --git a/web/src/routes.ts b/web/src/routes.ts
index 5b86ca27..739cc53f 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -206,12 +206,6 @@ const routes: RouteRecordRaw[] = [
             name: "administration/InformationSharingAgreementsPage",
             component: () => import("@/pages/administration/InformationSharingAgreementsPage.vue"),
           },
-          {
-            path: "information-sharing-agreements/new",
-            name: "administration/information-sharing-agreements/InformationSharingAgreementNewPage",
-            component: () =>
-              import("@/pages/administration/information-sharing-agreements/InformationSharingAgreementNewPage.vue"),
-          },
           {
             path: "information-sharing-agreements/:informationSharingAgreementId",
             component: () =>
@@ -241,13 +235,6 @@ const routes: RouteRecordRaw[] = [
               },
             ],
           },
-          {
-            path: "information-sharing-agreements/:informationSharingAgreementId/edit",
-            name: "administration/information-sharing-agreements/InformationSharingAgreementEditPage",
-            component: () =>
-              import("@/pages/administration/information-sharing-agreements/InformationSharingAgreementEditPage.vue"),
-            props: true,
-          },
           {
             path: "users",
             name: "users/UsersPage",

From a291a956e699ebf303c9d292926c8e9da55975fe Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Tue, 16 Jun 2026 12:39:29 -0700
Subject: [PATCH 08/25] todo concept

---
 web/src/routes.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/src/routes.ts b/web/src/routes.ts
index 739cc53f..a6aa7df0 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -219,6 +219,9 @@ const routes: RouteRecordRaw[] = [
                   name: "administration/information-sharing-agreements/InformationSharingAgreementAccessGrantsPage",
                 },
               },
+              /**
+               * TODO: consider if we should merge "access grant" concept with "groups". This would heavily simplify
+               */
               {
                 path: "access-grants",
                 name: "administration/information-sharing-agreements/InformationSharingAgreementAccessGrantsPage",

From 88567fdb4bd49f52180fbb8ff51f2fef7fae5a4c Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Tue, 16 Jun 2026 13:01:25 -0700
Subject: [PATCH 09/25] Removing comment in favour of jira ticket
 https://yg-hpw.atlassian.net/browse/TK-85

---
 web/src/routes.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/src/routes.ts b/web/src/routes.ts
index a6aa7df0..739cc53f 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -219,9 +219,6 @@ const routes: RouteRecordRaw[] = [
                   name: "administration/information-sharing-agreements/InformationSharingAgreementAccessGrantsPage",
                 },
               },
-              /**
-               * TODO: consider if we should merge "access grant" concept with "groups". This would heavily simplify
-               */
               {
                 path: "access-grants",
                 name: "administration/information-sharing-agreements/InformationSharingAgreementAccessGrantsPage",

From b61235aa9c23fceab9844d681ec6952bca881aa4 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Thu, 18 Jun 2026 12:34:18 -0700
Subject: [PATCH 10/25] Removing unused component

---
 ...rmationSharingAgreementAdminCreateForm.vue | 166 ------------------
 1 file changed, 166 deletions(-)
 delete mode 100644 web/src/components/information-sharing-agreements/InformationSharingAgreementAdminCreateForm.vue

diff --git a/web/src/components/information-sharing-agreements/InformationSharingAgreementAdminCreateForm.vue b/web/src/components/information-sharing-agreements/InformationSharingAgreementAdminCreateForm.vue
deleted file mode 100644
index 27dcd7db..00000000
--- a/web/src/components/information-sharing-agreements/InformationSharingAgreementAdminCreateForm.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-  <v-form
-    ref="form"
-    @submit.prevent="saveWrapper"
-  >
-    <v-row class="mt-2">
-      <v-col>
-        <InformationSharingAgreementBasicInformationEditCard
-          v-model:title="informationSharingAgreementAttributes.title"
-          v-model:purpose="informationSharingAgreementAttributes.purpose"
-          v-model:external-group-contact-id="
-            informationSharingAgreementAttributes.externalGroupContactId
-          "
-          v-model:external-group-contact-title="
-            informationSharingAgreementAttributes.externalGroupContactTitle
-          "
-          v-model:internal-group-contact-id="
-            informationSharingAgreementAttributes.internalGroupContactId
-          "
-          v-model:internal-group-contact-title="
-            informationSharingAgreementAttributes.internalGroupContactTitle
-          "
-          v-model:internal-group-secondary-contact-id="
-            informationSharingAgreementAttributes.internalGroupSecondaryContactId
-          "
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col>
-        <InformationSharingAgreementDurationEditCard
-          v-model:end-date="informationSharingAgreementAttributes.endDate"
-          v-model:expiration-condition="informationSharingAgreementAttributes.expirationCondition"
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col cols="12">
-        <InformationSharingAgreementAccessEditCard
-          v-model:access-level="informationSharingAgreementAttributes.accessLevel"
-          v-model:access-level-department-restriction="
-            informationSharingAgreementAttributes.accessLevelDepartmentRestriction
-          "
-          v-model:access-level-branch-restriction="
-            informationSharingAgreementAttributes.accessLevelBranchRestriction
-          "
-          v-model:access-level-unit-restriction="
-            informationSharingAgreementAttributes.accessLevelUnitRestriction
-          "
-          v-model:has-additional-access-restrictions="
-            informationSharingAgreementAttributes.hasAdditionalAccessRestrictions
-          "
-          v-model:additional-access-restrictions="
-            informationSharingAgreementAttributes.additionalAccessRestrictions
-          "
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col cols="12">
-        <InformationSharingAgreementConfidentialityEditCard
-          v-model:confidentiality-type="informationSharingAgreementAttributes.confidentialityType"
-          v-model:authorized-application="
-            informationSharingAgreementAttributes.authorizedApplication
-          "
-          class="border"
-        />
-      </v-col>
-    </v-row>
-
-    <v-row>
-      <v-col class="d-flex justify-end">
-        <v-btn
-          :loading="isLoading"
-          color="secondary"
-          variant="outlined"
-          :to="{
-            name: 'administration/InformationSharingAgreementsPage',
-          }"
-        >
-          Cancel
-        </v-btn>
-        <v-spacer />
-        <v-btn
-          class="ml-3"
-          :loading="isLoading"
-          type="submit"
-          color="primary"
-        >
-          Create
-        </v-btn>
-      </v-col>
-    </v-row>
-  </v-form>
-</template>
-
-<script setup lang="ts">
-import { isNil } from "lodash"
-import { ref, useTemplateRef } from "vue"
-import { useRouter } from "vue-router"
-
-import { VForm } from "vuetify/components"
-
-import informationSharingAgreementsApi, {
-  type InformationSharingAgreement,
-} from "@/api/information-sharing-agreements-api"
-
-import useSnack from "@/use/use-snack"
-
-import InformationSharingAgreementAccessEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementAccessEditCard.vue"
-import InformationSharingAgreementBasicInformationEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementBasicInformationEditCard.vue"
-import InformationSharingAgreementConfidentialityEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementConfidentialityEditCard.vue"
-import InformationSharingAgreementDurationEditCard from "@/components/information-sharing-agreements/InformationSharingAgreementDurationEditCard.vue"
-
-const informationSharingAgreementAttributes = ref<Partial<InformationSharingAgreement>>({
-  title: undefined,
-  description: undefined,
-  endDate: undefined,
-  externalGroupContactId: undefined,
-  internalGroupContactId: undefined,
-  internalGroupSecondaryContactId: undefined,
-  accessLevel: undefined,
-  accessLevelDepartmentRestriction: undefined,
-  accessLevelBranchRestriction: undefined,
-  accessLevelUnitRestriction: undefined,
-  additionalAccessRestrictions: undefined,
-  hasAdditionalAccessRestrictions: undefined,
-  confidentialityType: undefined,
-  authorizedApplication: undefined,
-})
-
-const form = useTemplateRef("form")
-const isLoading = ref(false)
-const snack = useSnack()
-const router = useRouter()
-
-async function saveWrapper() {
-  if (isNil(form.value)) return
-
-  const { valid } = await form.value.validate()
-  if (!valid) {
-    snack.error("Please fill out all required fields")
-    return
-  }
-
-  isLoading.value = true
-  try {
-    await informationSharingAgreementsApi.create(informationSharingAgreementAttributes.value)
-    snack.success("Information Sharing Agreement created.")
-    router.push({
-      name: "administration/InformationSharingAgreementsPage",
-    })
-  } catch (error) {
-    console.error(`Failed to create information sharing agreement: ${error}`, { error })
-    snack.error(`Failed to create information sharing agreement: ${error}`)
-  } finally {
-    isLoading.value = false
-  }
-}
-</script>

From 64c1b5b63f92157078d6929cc2bb2cb50c387d25 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Thu, 18 Jun 2026 13:58:37 -0700
Subject: [PATCH 11/25] Adding title slot to card

---
 .../InformationSharingAgreementBasicInformationCard.vue     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/src/components/information-sharing-agreements/InformationSharingAgreementBasicInformationCard.vue b/web/src/components/information-sharing-agreements/InformationSharingAgreementBasicInformationCard.vue
index e0db27f9..b7c73ab9 100644
--- a/web/src/components/information-sharing-agreements/InformationSharingAgreementBasicInformationCard.vue
+++ b/web/src/components/information-sharing-agreements/InformationSharingAgreementBasicInformationCard.vue
@@ -1,8 +1,10 @@
 <template>
   <v-card>
     <v-card-title class="bg-grey-lighten-4 d-flex align-center ga-3 px-6 py-4">
-      <v-icon color="accent">mdi-information-outline</v-icon>
-      <span>Basic Information</span>
+      <slot name="title">
+        <v-icon color="accent">mdi-information-outline</v-icon>
+        Basic Information
+      </slot>
     </v-card-title>
     <v-divider />
     <v-card-text class="pa-6 pa-md-8">

From f4f2456a0011fa22fa34921f188638fb5179ae94 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Thu, 18 Jun 2026 14:00:01 -0700
Subject: [PATCH 12/25] Simplifying admin ISA pages more

---
 .../InformationSharingAgreementCard.vue       | 251 ------------------
 ...ringAgreementsAdminEditDataTableServer.vue |  66 -----
 .../InformationSharingAgreementsPage.vue      |  13 -
 .../InformationSharingAgreementPage.vue       |  52 ++--
 .../InformationSharingAgreementNewPage.vue    |  20 +-
 5 files changed, 49 insertions(+), 353 deletions(-)
 delete mode 100644 web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue

diff --git a/web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue b/web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue
deleted file mode 100644
index eddec2cb..00000000
--- a/web/src/components/information-sharing-agreements/InformationSharingAgreementCard.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <v-skeleton-loader
-    v-if="isNil(informationSharingAgreement)"
-    type="card"
-  />
-  <v-card
-    v-else
-    class="border"
-    title="Information Sharing Agreement Details"
-  >
-    <template #text>
-      <v-row>
-        <v-col cols="6">
-          <v-text-field
-            :model-value="informationSharingAgreement.title"
-            label="Title"
-            readonly
-          />
-        </v-col>
-        <v-col cols="6">
-          <v-text-field
-            :model-value="informationSharingAgreement.identifier"
-            label="Identifier"
-            readonly
-          />
-        </v-col>
-        <v-col cols="12">
-          <v-textarea
-            :model-value="informationSharingAgreement.description || 'No description provided'"
-            label="Description"
-            readonly
-            rows="2"
-            auto-grow
-          />
-        </v-col>
-        <v-col
-          v-if="
-            informationSharingAgreement.externalGroupId ||
-            informationSharingAgreement.internalGroupId
-          "
-          cols="12"
-          md="6"
-        >
-          <v-card
-            v-if="informationSharingAgreement.externalGroupId"
-            class="border"
-            color="#ffffff66"
-          >
-            <v-card-text>
-              <h3 class="mt-n1 mb-3">External Group</h3>
-
-              <h4>Group:</h4>
-              <GroupChip :group-id="informationSharingAgreement.externalGroupId" />
-
-              <h4 class="mt-3">Contact:</h4>
-              <UserChip :user-id="informationSharingAgreement.externalGroupContactId" />
-            </v-card-text>
-          </v-card>
-        </v-col>
-        <v-col
-          v-if="
-            informationSharingAgreement.externalGroupId ||
-            informationSharingAgreement.internalGroupId
-          "
-          cols="12"
-          md="6"
-        >
-          <v-card
-            v-if="informationSharingAgreement.internalGroupId"
-            class="border"
-            color="#ffffff66"
-          >
-            <v-card-text>
-              <h3 class="mt-n1 mb-3">Internal Group</h3>
-
-              <h4>Group:</h4>
-              <GroupChip :group-id="informationSharingAgreement.internalGroupId" />
-
-              <h4 class="mt-3">Contact:</h4>
-              <UserChip :user-id="informationSharingAgreement.internalGroupContactId" />
-            </v-card-text>
-          </v-card>
-        </v-col>
-        <v-col cols="12">
-          <v-text-field
-            :model-value="duration"
-            label="Duration"
-            readonly
-          />
-        </v-col>
-        <v-col
-          v-if="
-            informationSharingAgreement.status === InformationSharingAgreementStatuses.SIGNED &&
-            !isNil(signedConfidentialityAcknowledgement)
-          "
-          cols="12"
-        >
-          <InformationSharingAgreementSignedDocumentsCard
-            :information-sharing-agreement-id="informationSharingAgreementId"
-            :acknowledgement="signedConfidentialityAcknowledgement"
-            :receipt="signedConfidentialityReceipt"
-          />
-        </v-col>
-      </v-row>
-
-      <div class="d-flex flex-column flex-md-row mt-5 justify-space-between ga-2">
-        <div class="d-flex flex-column flex-md-row ga-2">
-          <template
-            v-if="informationSharingAgreement.status === InformationSharingAgreementStatuses.DRAFT"
-          >
-            <InformationSharingAgreementConfidentialityAcknowledgementDownloadButton
-              :information-sharing-agreement-id="informationSharingAgreementId"
-              :activator-props="{
-                variant: 'outlined',
-                color: 'secondary',
-              }"
-            />
-            <InformationSharingAgreementConfidentialityReceiptGenerateButton
-              v-if="isConfidentialityTypeAcceptedInConfidence"
-              :information-sharing-agreement-id="informationSharingAgreementId"
-              :activator-props="{
-                variant: 'outlined',
-                color: 'secondary',
-              }"
-            />
-            <v-btn
-              color="secondary"
-              v-bind="signButtonProps"
-            >
-              Mark as Signed
-            </v-btn>
-          </template>
-          <template
-            v-else-if="
-              informationSharingAgreement.status === InformationSharingAgreementStatuses.SIGNED
-            "
-          >
-            <v-btn
-              color="warning"
-              variant="outlined"
-            >
-              Revert to Draft
-              <InformationSharingAgreementRevertToDraftDialog
-                :information-sharing-agreement-id="informationSharingAgreementId"
-                activator="parent"
-                @success="refresh"
-              />
-            </v-btn>
-          </template>
-        </div>
-
-        <div class="d-flex flex-column flex-md-row justify-end ga-2">
-          <v-btn
-            v-if="
-              policy?.update &&
-              informationSharingAgreement.status === InformationSharingAgreementStatuses.DRAFT
-            "
-            color="primary"
-            v-bind="editButtonProps"
-          >
-            Edit
-          </v-btn>
-        </div>
-      </div>
-    </template>
-  </v-card>
-</template>
-
-<script setup lang="ts">
-import { computed, toRefs } from "vue"
-import { isNil } from "lodash"
-
-import { type VBtn } from "vuetify/components"
-
-import { formatDate } from "@/utils/formatters"
-
-import useInformationSharingAgreement, {
-  InformationSharingAgreementStatuses,
-  InformationSharingAgreementConfidentialityType,
-} from "@/use/use-information-sharing-agreement"
-
-import InformationSharingAgreementConfidentialityAcknowledgementDownloadButton from "@/components/information-sharing-agreements/draft/InformationSharingAgreementConfidentialityAcknowledgementDownloadButton.vue"
-import InformationSharingAgreementConfidentialityReceiptGenerateButton from "@/components/information-sharing-agreements/draft/InformationSharingAgreementConfidentialityReceiptGenerateButton.vue"
-import InformationSharingAgreementSignedDocumentsCard from "@/components/information-sharing-agreements/InformationSharingAgreementSignedDocumentsCard.vue"
-import InformationSharingAgreementRevertToDraftDialog from "@/components/information-sharing-agreements/InformationSharingAgreementRevertToDraftDialog.vue"
-
-import GroupChip from "@/components/groups/GroupChip.vue"
-import UserChip from "@/components/users/UserChip.vue"
-
-type VBtnProps = VBtn["$props"]
-
-const props = withDefaults(
-  defineProps<{
-    informationSharingAgreementId: number
-    cancelButtonProps?: VBtnProps
-    editButtonProps?: VBtnProps
-    signButtonProps?: VBtnProps
-  }>(),
-  {
-    cancelButtonProps: () => ({
-      to: {
-        name: "administration/InformationSharingAgreementsPage",
-      },
-    }),
-    editButtonProps: ({ informationSharingAgreementId }) => ({
-      to: {
-        name: "information-sharing-agreements/InformationSharingAgreementEditPage",
-        params: {
-          informationSharingAgreementId,
-        },
-      },
-    }),
-    signButtonProps: ({ informationSharingAgreementId }) => ({
-      to: {
-        name: "information-sharing-agreements/InformationSharingAgreementSignPage",
-        params: {
-          informationSharingAgreementId,
-        },
-      },
-    }),
-  }
-)
-
-const { informationSharingAgreementId } = toRefs(props)
-const { informationSharingAgreement, policy, refresh } = useInformationSharingAgreement(
-  informationSharingAgreementId
-)
-const duration = computed(() => {
-  const startDateFormatted = formatDate(informationSharingAgreement.value?.startDate)
-  const endDateFormatted = formatDate(informationSharingAgreement.value?.endDate)
-  return [startDateFormatted, endDateFormatted].filter(Boolean).join(" to ")
-})
-
-const signedConfidentialityAcknowledgement = computed(
-  () => informationSharingAgreement.value?.signedConfidentialityAcknowledgement
-)
-const signedConfidentialityReceipt = computed(
-  () => informationSharingAgreement.value?.signedConfidentialityReceipt
-)
-const isConfidentialityTypeAcceptedInConfidence = computed(
-  () =>
-    informationSharingAgreement.value?.confidentialityType ===
-    InformationSharingAgreementConfidentialityType.ACCEPTED_IN_CONFIDENCE
-)
-</script>
-
-<style scoped>
-.whitespace-pre-wrap {
-  white-space: pre-wrap;
-}
-</style>
diff --git a/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue b/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue
index cda0ec44..6f386969 100644
--- a/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue
+++ b/web/src/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue
@@ -33,44 +33,6 @@
     <template #item.creatorId="{ item }">
       <UserChip :user-id="item.creatorId" />
     </template>
-    <template #item.actions="{ item }">
-      <div class="d-flex justify-end align-center">
-        <v-btn
-          v-if="item.policy.update"
-          :to="{
-            name: 'information-sharing-agreements/InformationSharingAgreementEditPage',
-            params: {
-              informationSharingAgreementId: item.id,
-            },
-          }"
-          :loading="isDeleting"
-          title="Edit"
-          icon="mdi-pencil"
-          size="x-small"
-          color="primary"
-          variant="outlined"
-          @click.stop
-        />
-        <v-btn
-          v-if="item.policy.destroy"
-          class="ml-2"
-          :loading="isDeleting"
-          title="Delete"
-          icon="mdi-delete"
-          size="x-small"
-          color="error"
-          variant="outlined"
-          @click.stop="confirmThenDelete(item)"
-        />
-
-        <div
-          v-if="!item.policy.update && !item.policy.destroy"
-          class="mx-auto text-caption text-medium-emphasis"
-        >
-          &mdash;
-        </div>
-      </div>
-    </template>
   </v-data-table-server>
 </template>
 
@@ -82,10 +44,8 @@ import { isNil } from "lodash"
 
 import { formatDate } from "@/utils/formatters"
 
-import informationSharingAgreementsApi from "@/api/information-sharing-agreements-api"
 import useVuetifySortByToSafeRouteQuery from "@/use/utils/use-vuetify-sort-by-to-safe-route-query"
 import useVuetifySortByToSequelizeSafeOrder from "@/use/utils/use-vuetify-sort-by-to-sequelize-safe-order"
-import useSnack from "@/use/use-snack"
 import useInformationSharingAgreements, {
   type InformationSharingAgreementAsIndex,
   type InformationSharingAgreementWhereOptions,
@@ -146,11 +106,6 @@ const headers = ref([
     title: "Creator",
     key: "creatorId",
   },
-  {
-    title: "Actions",
-    key: "actions",
-    sortable: false,
-  },
 ])
 
 const page = useRouteQuery(`page${props.routeQuerySuffix}`, "1", { transform: Number })
@@ -185,27 +140,6 @@ function goToInformationSharingAgreementPage(informationSharingAgreementId: numb
   })
 }
 
-const snack = useSnack()
-const isDeleting = ref(false)
-
-async function confirmThenDelete(informationSharingAgreement: InformationSharingAgreementAsIndex) {
-  const { title } = informationSharingAgreement
-
-  const result = confirm(`Are you sure you want to delete ${title}.`)
-  if (result === false) return
-
-  isDeleting.value = true
-  try {
-    await informationSharingAgreementsApi.delete(informationSharingAgreement.id)
-    await refresh()
-  } catch (error) {
-    console.error(error)
-    snack.error(`Failed to delete information sharing agreement: ${error}`)
-  } finally {
-    isDeleting.value = false
-  }
-}
-
 defineExpose({
   refresh,
 })
diff --git a/web/src/pages/administration/InformationSharingAgreementsPage.vue b/web/src/pages/administration/InformationSharingAgreementsPage.vue
index 5cecff94..4cb065e4 100644
--- a/web/src/pages/administration/InformationSharingAgreementsPage.vue
+++ b/web/src/pages/administration/InformationSharingAgreementsPage.vue
@@ -7,16 +7,6 @@
           label="Search"
           density="compact"
         />
-        <v-btn
-          v-if="isSystemAdmin || isExternalGroupAdmin"
-          color="primary"
-          :to="{
-            name: 'information-sharing-agreements/InformationSharingAgreementNewPage',
-          }"
-          style="height: 40px"
-        >
-          <span class="text-pre-wrap">New Agreement</span>
-        </v-btn>
       </div>
 
       <InformationSharingAgreementsAdminEditDataTableServer :filters="filters" />
@@ -29,13 +19,10 @@ import { computed, ref } from "vue"
 import { isEmpty, isNil } from "lodash"
 
 import useBreadcrumbs, { ADMIN_CRUMB } from "@/use/use-breadcrumbs"
-import useCurrentUser from "@/use/use-current-user"
 
 import FilterSearchDebouncedTextField from "@/components/common/tables/FilterSearchDebouncedTextField.vue"
 import InformationSharingAgreementsAdminEditDataTableServer from "@/components/information-sharing-agreements/InformationSharingAgreementsAdminEditDataTableServer.vue"
 
-const { isSystemAdmin, isExternalGroupAdmin } = useCurrentUser()
-
 const search = ref("")
 
 const filters = computed(() => {
diff --git a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue b/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue
index 81e362c8..47fcb6a5 100644
--- a/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue
+++ b/web/src/pages/administration/information-sharing-agreements/InformationSharingAgreementPage.vue
@@ -1,9 +1,33 @@
 <template>
-  <InformationSharingAgreementCard
-    :information-sharing-agreement-id="informationSharingAgreementIdAsNumber"
-    :edit-button-props="editButtonProps"
-    :sign-button-props="signButtonProps"
+  <v-skeleton-loader
+    v-if="isNil(informationSharingAgreement)"
+    type="card"
   />
+  <InformationSharingAgreementBasicInformationCard
+    v-else
+    class="rounded-lg"
+    :title="informationSharingAgreement.title"
+    :purpose="informationSharingAgreement.purpose"
+    :external-group-contact-id="informationSharingAgreement.externalGroupContactId"
+    :external-group-contact-title="informationSharingAgreement.externalGroupContactTitle"
+    :internal-group-contact-id="informationSharingAgreement.internalGroupContactId"
+    :internal-group-contact-title="informationSharingAgreement.internalGroupContactTitle"
+    :internal-group-secondary-contact-id="
+      informationSharingAgreement.internalGroupSecondaryContactId
+    "
+  >
+    <template #title>
+      <v-icon color="accent">mdi-information-outline</v-icon>
+      Basic Information
+      <v-spacer />
+      <v-btn
+        v-bind="editButtonProps"
+        variant="outlined"
+        prepend-icon="mdi-open-in-new"
+        text="Go To ISA Page"
+      />
+    </template>
+  </InformationSharingAgreementBasicInformationCard>
 
   <v-card class="mt-5 border">
     <!-- TODO: consider if we should have separate tabs for external and internal groups access grants? -->
@@ -31,12 +55,14 @@
 </template>
 
 <script setup lang="ts">
+import { isNil } from "lodash"
 import { computed } from "vue"
 import { useRouter } from "vue-router"
 
 import useBreadcrumbs, { ADMIN_CRUMB } from "@/use/use-breadcrumbs"
+import useInformationSharingAgreement from "@/use/use-information-sharing-agreement"
 
-import InformationSharingAgreementCard from "@/components/information-sharing-agreements/InformationSharingAgreementCard.vue"
+import InformationSharingAgreementBasicInformationCard from "@/components/information-sharing-agreements/InformationSharingAgreementBasicInformationCard.vue"
 
 const props = defineProps<{
   informationSharingAgreementId: string
@@ -46,6 +72,10 @@ const informationSharingAgreementIdAsNumber = computed(() =>
   parseInt(props.informationSharingAgreementId)
 )
 
+const { informationSharingAgreement } = useInformationSharingAgreement(
+  informationSharingAgreementIdAsNumber
+)
+
 const router = useRouter()
 const returnToHref = computed(() => {
   const routeLocation = router.resolve({
@@ -69,18 +99,6 @@ const editButtonProps = computed(() => ({
   },
 }))
 
-const signButtonProps = computed(() => ({
-  to: {
-    name: "information-sharing-agreements/InformationSharingAgreementSignPage",
-    params: {
-      informationSharingAgreementId: props.informationSharingAgreementId,
-    },
-    query: {
-      returnTo: returnToHref.value,
-    },
-  },
-}))
-
 useBreadcrumbs("Information Sharing Agreement", [
   ADMIN_CRUMB,
   {
diff --git a/web/src/pages/information-sharing-agreements/InformationSharingAgreementNewPage.vue b/web/src/pages/information-sharing-agreements/InformationSharingAgreementNewPage.vue
index e95b07dc..88c08231 100644
--- a/web/src/pages/information-sharing-agreements/InformationSharingAgreementNewPage.vue
+++ b/web/src/pages/information-sharing-agreements/InformationSharingAgreementNewPage.vue
@@ -39,9 +39,7 @@
           Create
         </v-btn>
         <v-btn
-          :to="{
-            name: 'InformationSharingAgreementsPage',
-          }"
+          :to="cancelTo"
           color="secondary"
           variant="outlined"
           :loading="isLoading"
@@ -55,10 +53,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, useTemplateRef } from "vue"
-import { useRouter } from "vue-router"
+import { computed, ref, useTemplateRef } from "vue"
+import { useRoute, useRouter } from "vue-router"
 import { useDisplay } from "vuetify"
-import { isNil } from "lodash"
+import { isEmpty, isNil, isString } from "lodash"
 
 import { VForm } from "vuetify/components"
 
@@ -84,8 +82,18 @@ const informationSharingAgreementAttributes = ref<Partial<InformationSharingAgre
 const form = useTemplateRef("form")
 const isLoading = ref(false)
 const snack = useSnack()
+const route = useRoute()
 const router = useRouter()
 
+const cancelTo = computed(() => {
+  const rawReturnTo = route.query.returnTo
+  if (isNil(rawReturnTo) || isEmpty(rawReturnTo) || !isString(rawReturnTo)) {
+    return { name: "InformationSharingAgreementsPage" }
+  }
+
+  return rawReturnTo
+})
+
 async function saveAndGoToEditPage() {
   if (isNil(form.value)) return
 

From f7a8aee679129dab970da818d53fff508124967c Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Tue, 16 Jun 2026 13:50:33 -0700
Subject: [PATCH 13/25] Simplifying ISA archive item create steps

---
 ...nSharingAgreementArchiveItemCreateForm.vue | 125 +++---------------
 ...tionSharingAgreementArchiveItemNewPage.vue |  78 ++++++++---
 2 files changed, 76 insertions(+), 127 deletions(-)

diff --git a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
index 130cfd57..f7378430 100644
--- a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
+++ b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
@@ -6,90 +6,7 @@
   >
     <v-card class="border">
       <FileDrop @files-dropped="attachDroppedFiles">
-        <v-card-title>Knowledge Item Description</v-card-title>
-        <v-card-text>
-          <v-row>
-            <v-col
-              cols="12"
-              md="8"
-            >
-              <v-text-field
-                v-model="archiveItemAttributes.title"
-                label="Title *"
-                :rules="[required]"
-                required
-              />
-            </v-col>
-            <v-col
-              cols="12"
-              md="4"
-            >
-              <SecurityLevelSelect
-                v-model="archiveItemAttributes.securityLevel"
-                :rules="[required]"
-                label="Security level *"
-                required
-              />
-            </v-col>
-            <v-col cols="12">
-              <v-textarea
-                v-model="archiveItemAttributes.description"
-                label="Description *"
-                :rules="[required]"
-                auto-grow
-                required
-                rows="8"
-              />
-            </v-col>
-          </v-row>
-        </v-card-text>
-
-        <v-card-title>Yukon First Nation</v-card-title>
-        <v-card-text>
-          <p class="mb-4">
-            The Yukon First Nation is determined by the sharing contact on the Information Sharing
-            Agreement.
-          </p>
-          <ExternalOrganizationChip
-            v-if="externalGroupContactOrganization"
-            :external-organization-id="externalGroupContactOrganization.id"
-            variant="outlined"
-          />
-          <span
-            v-else
-            class="text-medium-emphasis"
-          >
-            No organization found for the sharing contact on this agreement.
-          </span>
-        </v-card-text>
-
-        <v-card-title>Sharing Purpose</v-card-title>
-        <v-card-text>
-          <p class="mb-3">For what purpose this traditional knowledge is shared?</p>
-          <v-textarea
-            v-model="archiveItemAttributes.sharingPurpose"
-            label="Sharing Purpose *"
-            :rules="[required]"
-            auto-grow
-            required
-            rows="8"
-          />
-          <v-checkbox
-            v-model="archiveItemAttributes.confidentialityReceipt"
-            label="I confirm that I have received and agreed to the confidentiality terms."
-            class="mt-3"
-            :rules="[required]"
-            required
-            hide-details
-          />
-        </v-card-text>
-
-        <v-divider
-          thickness="2"
-          class="mb-4"
-        />
-
-        <v-card-title>Categories and Tags</v-card-title>
+        <v-card-title> Categories and Tags </v-card-title>
         <v-card-text>
           <p class="mb-4">
             Categories and Tags are used as filter criteria to find items. You can select as many of
@@ -130,8 +47,8 @@
             type="submit"
             class="mt-5"
             :loading="isLoading"
-            >Save</v-btn
-          >
+            text="Create"
+          />
         </v-card-text>
       </FileDrop>
     </v-card>
@@ -139,7 +56,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, toRefs, useTemplateRef, watchEffect } from "vue"
+import { computed, ref, useTemplateRef, watchEffect } from "vue"
 import { useRouter } from "vue-router"
 import { isNil } from "lodash"
 
@@ -148,29 +65,23 @@ import { required } from "@/utils/validators"
 import Api from "@/api"
 import { type ArchiveItemCreationAttributes } from "@/api/information-sharing-agreements/archive-items-api"
 import { SecurityLevel } from "@/api/archive-items-api"
-import { InformationSharingAgreementAccessLevels } from "@/api/information-sharing-agreements-api"
+import {
+  InformationSharingAgreementAccessLevels,
+  type InformationSharingAgreementAsShow,
+} from "@/api/information-sharing-agreements-api"
 
 import useExternalOrganizations from "@/use/use-external-organizations"
-import useInformationSharingAgreement from "@/use/use-information-sharing-agreement"
 import useSnack from "@/use/use-snack"
 
 import EnhancedFileInput from "@/components/common/EnhancedFileInput.vue"
 import FileDrop from "@/components/common/FileDrop.vue"
 
 import CategorySelect from "@/components/categories/CategorySelect.vue"
-import ExternalOrganizationChip from "@/components/external-organizations/ExternalOrganizationChip.vue"
-
-import SecurityLevelSelect from "@/components/archive-items/SecurityLevelSelect.vue"
 
 const props = defineProps<{
-  informationSharingAgreementId: number
+  informationSharingAgreement: InformationSharingAgreementAsShow
 }>()
 
-const { informationSharingAgreementId } = toRefs(props)
-const { informationSharingAgreement } = useInformationSharingAgreement(
-  informationSharingAgreementId
-)
-
 const archiveItemAttributes = ref<Partial<ArchiveItemCreationAttributes>>({
   title: "",
   securityLevel: SecurityLevel.LOW,
@@ -189,21 +100,19 @@ const ACCESS_LEVEL_TO_SECURITY_LEVEL = {
 }
 
 watchEffect(() => {
-  if (informationSharingAgreement.value) {
-    const { accessLevel, purpose, authorizedApplication, title } = informationSharingAgreement.value
+  const { accessLevel, purpose, authorizedApplication, title } = props.informationSharingAgreement
 
-    const accessLevelOrDefault = accessLevel ?? InformationSharingAgreementAccessLevels.INTERNAL
+  const accessLevelOrDefault = accessLevel ?? InformationSharingAgreementAccessLevels.INTERNAL
 
-    archiveItemAttributes.value.securityLevel = ACCESS_LEVEL_TO_SECURITY_LEVEL[accessLevelOrDefault]
-    archiveItemAttributes.value.sharingPurpose = authorizedApplication
-    archiveItemAttributes.value.description = purpose
-    archiveItemAttributes.value.title = title
-  }
+  archiveItemAttributes.value.securityLevel = ACCESS_LEVEL_TO_SECURITY_LEVEL[accessLevelOrDefault]
+  archiveItemAttributes.value.sharingPurpose = authorizedApplication
+  archiveItemAttributes.value.description = purpose
+  archiveItemAttributes.value.title = title
 })
 
 const NULL_USER_ID = -1
 const externalGroupContactId = computed(
-  () => informationSharingAgreement.value?.externalGroupContactId
+  () => props.informationSharingAgreement.externalGroupContactId
 )
 const externalOrganizationsQuery = computed(() => ({
   filters: {
@@ -254,7 +163,7 @@ async function saveAndRedirect() {
   isLoading.value = true
   try {
     const { archiveItem } = await Api.InformationSharingAgreements.archiveItemsApi.create(
-      props.informationSharingAgreementId,
+      props.informationSharingAgreement.id,
       archiveItemAttributes.value,
       files.value
     )
diff --git a/web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue b/web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue
index 26b0b1ec..0487a1ee 100644
--- a/web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue
+++ b/web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue
@@ -1,38 +1,78 @@
 <template>
-  <InformationSharingAgreementCreateArchiveItemForm
-    :information-sharing-agreement-id="informationSharingAgreementIdAsNumber"
+  <v-skeleton-loader
+    v-if="isLoading || isNil(informationSharingAgreement)"
+    type="card"
   />
+  <div v-else>
+    <InformationSharingAgreementBasicInformationCard
+      :title="informationSharingAgreement.title"
+      :purpose="informationSharingAgreement.purpose"
+      :external-group-contact-id="informationSharingAgreement.externalGroupContactId"
+      :external-group-contact-title="informationSharingAgreement.externalGroupContactTitle"
+      :internal-group-contact-id="informationSharingAgreement.internalGroupContactId"
+      :internal-group-contact-title="informationSharingAgreement.internalGroupContactTitle"
+      :internal-group-secondary-contact-id="
+        informationSharingAgreement.internalGroupSecondaryContactId
+      "
+    >
+      <template #title>
+        <v-icon
+          color="accent"
+          icon="mdi-information-outline"
+        />
+        ISA Basic Information
+      </template>
+    </InformationSharingAgreementBasicInformationCard>
+
+    <InformationSharingAgreementArchiveItemCreateForm
+      class="mt-4"
+      :information-sharing-agreement="informationSharingAgreement"
+    />
+  </div>
 </template>
 
 <script setup lang="ts">
+import { isNil } from "lodash"
 import { computed } from "vue"
 
 import useBreadcrumbs, { BASE_CRUMB } from "@/use/use-breadcrumbs"
+import useInformationSharingAgreement from "@/use/use-information-sharing-agreement"
 
-import InformationSharingAgreementCreateArchiveItemForm from "@/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue"
+import InformationSharingAgreementBasicInformationCard from "@/components/information-sharing-agreements/InformationSharingAgreementBasicInformationCard.vue"
+import InformationSharingAgreementArchiveItemCreateForm from "@/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue"
 
 const props = defineProps<{
   informationSharingAgreementId: string
 }>()
 
-const informationSharingAgreementIdAsNumber = computed(() => parseInt(props.informationSharingAgreementId))
+const informationSharingAgreementIdAsNumber = computed(() =>
+  parseInt(props.informationSharingAgreementId)
+)
+
+const { informationSharingAgreement, isLoading } = useInformationSharingAgreement(
+  informationSharingAgreementIdAsNumber
+)
 
-useBreadcrumbs("Create Knowledge Item from Agreement", [
-  BASE_CRUMB,
-  {
-    title: "Information Sharing Agreements",
-    to: {
-      name: "InformationSharingAgreementsPage",
+const breadcrumbs = computed(() => {
+  return [
+    BASE_CRUMB,
+    {
+      title: "Information Sharing Agreements",
+      to: {
+        name: "InformationSharingAgreementsPage",
+      },
     },
-  },
-  {
-    title: `Agreement ${props.informationSharingAgreementId}`,
-    to: {
-      name: "information-sharing-agreements/InformationSharingAgreementPage",
-      params: {
-        informationSharingAgreementId: props.informationSharingAgreementId,
+    {
+      title: informationSharingAgreement.value?.title ?? "Loading...",
+      to: {
+        name: "information-sharing-agreements/InformationSharingAgreementPage",
+        params: {
+          informationSharingAgreementId: props.informationSharingAgreementId,
+        },
       },
     },
-  },
-])
+  ]
+})
+
+useBreadcrumbs("Create Knowledge Item from Agreement", breadcrumbs)
 </script>

From dc35a4f6483861cd1393967f5e97d93db9d4f0cb Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Tue, 16 Jun 2026 14:06:33 -0700
Subject: [PATCH 14/25] adding back in confidentialityReceipt as its required
 for create

---
 ...nSharingAgreementArchiveItemCreateForm.vue | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
index f7378430..1c669c07 100644
--- a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
+++ b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
@@ -6,6 +6,23 @@
   >
     <v-card class="border">
       <FileDrop @files-dropped="attachDroppedFiles">
+        <v-card-title>Knowledge Item</v-card-title>
+        <v-card-text>
+          <v-checkbox
+            v-model="archiveItemAttributes.confidentialityReceipt"
+            label="I confirm that I have received and agreed to the confidentiality terms."
+            class="mt-3"
+            :rules="[required]"
+            required
+            hide-details
+          />
+        </v-card-text>
+
+        <v-divider
+          thickness="2"
+          class="mb-4"
+        />
+
         <v-card-title> Categories and Tags </v-card-title>
         <v-card-text>
           <p class="mb-4">
@@ -87,7 +104,7 @@ const archiveItemAttributes = ref<Partial<ArchiveItemCreationAttributes>>({
   securityLevel: SecurityLevel.LOW,
   description: null,
   sharingPurpose: null,
-  confidentialityReceipt: false,
+  confidentialityReceipt: undefined,
   yukonFirstNations: [],
   tags: [],
   archiveItemCategoriesAttributes: [],

From 52992d6861185597bb63c60a2870319799504998 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Mon, 22 Jun 2026 13:19:12 -0700
Subject: [PATCH 15/25] removing new archive button, since knowledge items
 require ISA to be created onto

---
 .../archive-items/ArchiveItemNewButton.vue    | 23 -------------------
 web/src/pages/DashboardPage.vue               |  7 ------
 .../archive-items/ArchiveItemListPage.vue     | 19 ++++++---------
 3 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 web/src/components/archive-items/ArchiveItemNewButton.vue

diff --git a/web/src/components/archive-items/ArchiveItemNewButton.vue b/web/src/components/archive-items/ArchiveItemNewButton.vue
deleted file mode 100644
index 454faa78..00000000
--- a/web/src/components/archive-items/ArchiveItemNewButton.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <v-card
-    class="toggle fill-height"
-    :to="{
-      name: 'archive-items/ArchiveItemNewPage',
-    }"
-  >
-    <v-card-text class="d-flex">
-      <span class="d-sm-flex align-center me-3 d-none">
-        <v-icon size="50px">mdi-archive-plus</v-icon>
-      </span>
-
-      <div>
-        <div class="text-h6">New Knowledge Item</div>
-        <span class="text-subtitle-2"
-          >Create a Knowledge Item by adding metadata and attaching files.</span
-        >
-      </div>
-    </v-card-text>
-  </v-card>
-</template>
-
-<script setup></script>
diff --git a/web/src/pages/DashboardPage.vue b/web/src/pages/DashboardPage.vue
index 8b63d8d9..e7bf182d 100644
--- a/web/src/pages/DashboardPage.vue
+++ b/web/src/pages/DashboardPage.vue
@@ -12,12 +12,6 @@
             Traditional Knowledge with the Yukon Government.
           </p>
 
-          <v-row>
-            <v-col cols="12">
-              <ArchiveItemNewButton />
-            </v-col>
-          </v-row>
-
           <v-row>
             <v-col>
               <p>
@@ -57,7 +51,6 @@
 </template>
 
 <script lang="ts" setup>
-import ArchiveItemNewButton from "@/components/archive-items/ArchiveItemNewButton.vue"
 import InformationSharingAgreementNewCard from "@/components/information-sharing-agreements/InformationSharingAgreementNewCard.vue"
 import VaultInfoCard from "@/components/common/VaultInfoCard.vue"
 import VaultStatisticsCard from "@/components/common/VaultStatisticsCard.vue"
diff --git a/web/src/pages/archive-items/ArchiveItemListPage.vue b/web/src/pages/archive-items/ArchiveItemListPage.vue
index 8fbe289b..b38b7514 100644
--- a/web/src/pages/archive-items/ArchiveItemListPage.vue
+++ b/web/src/pages/archive-items/ArchiveItemListPage.vue
@@ -77,7 +77,7 @@
       <v-row class="mb-3">
         <v-col
           cols="12"
-          md="4"
+          md="8"
         >
           <v-text-field
             v-model="search"
@@ -85,21 +85,16 @@
             density="compact"
           />
         </v-col>
-        <v-col class="d-flex">
+        <v-col
+          cols="12"
+          md="4"
+          class="d-flex"
+        >
           <StatusSelect
             v-model="status"
             label="Status"
             density="compact"
-          />
-
-          <v-btn
-            class="ml-6"
-            color="primary"
-            text="New Knowledge Item"
-            style="height: 40px"
-            :to="{
-              name: 'archive-items/ArchiveItemNewPage',
-            }"
+            clearable
           />
         </v-col>
       </v-row>

From 6014b99f8cba5e3c853613adc82d133ab20bf2ef Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Mon, 22 Jun 2026 13:19:35 -0700
Subject: [PATCH 16/25] Removing categories and tags section

---
 ...nSharingAgreementArchiveItemCreateForm.vue | 37 -------------------
 1 file changed, 37 deletions(-)

diff --git a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
index 1c669c07..d54c3112 100644
--- a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
+++ b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
@@ -23,31 +23,6 @@
           class="mb-4"
         />
 
-        <v-card-title> Categories and Tags </v-card-title>
-        <v-card-text>
-          <p class="mb-4">
-            Categories and Tags are used as filter criteria to find items. You can select as many of
-            each as are applicable to this item.
-          </p>
-          <CategorySelect
-            v-model="categoryIds"
-            label="Categories *"
-            :rules="[required]"
-            hide-selected
-            multiple
-            chips
-            :closable-chips="categoryIds.length > 1"
-          />
-          <v-combobox
-            v-model="archiveItemAttributes.tags"
-            label="Tags"
-            class="mt-3"
-            multiple
-            chips
-            clearable
-          />
-        </v-card-text>
-
         <v-card-title>Attachments</v-card-title>
 
         <v-card-text>
@@ -93,8 +68,6 @@ import useSnack from "@/use/use-snack"
 import EnhancedFileInput from "@/components/common/EnhancedFileInput.vue"
 import FileDrop from "@/components/common/FileDrop.vue"
 
-import CategorySelect from "@/components/categories/CategorySelect.vue"
-
 const props = defineProps<{
   informationSharingAgreement: InformationSharingAgreementAsShow
 }>()
@@ -153,16 +126,6 @@ function attachDroppedFiles(droppedFiles: File[]) {
   files.value = droppedFiles
 }
 
-const categoryIds = ref<number[]>([])
-
-watchEffect(() => {
-  archiveItemAttributes.value.archiveItemCategoriesAttributes = categoryIds.value.map(
-    (categoryId) => ({
-      categoryId,
-    })
-  )
-})
-
 const isLoading = ref(false)
 const form = useTemplateRef("form")
 const snack = useSnack()

From bdab8526910dc3e4bf864b65431cbe89aaea4976 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Mon, 22 Jun 2026 15:53:37 -0700
Subject: [PATCH 17/25] ISA archive item creation moved to a dialog

---
 ...aringAgreementArchiveItemCreateDialog.vue} | 133 +++++++++++-------
 ...ationSharingAgreementSignedActionsMenu.vue |  31 +++-
 ...tionSharingAgreementArchiveItemNewPage.vue |  78 ----------
 web/src/routes.ts                             |   7 -
 4 files changed, 106 insertions(+), 143 deletions(-)
 rename web/src/components/information-sharing-agreements/archive-items/{InformationSharingAgreementArchiveItemCreateForm.vue => InformationSharingAgreementArchiveItemCreateDialog.vue} (60%)
 delete mode 100644 web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue

diff --git a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
similarity index 60%
rename from web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
rename to web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
index d54c3112..e735c4a6 100644
--- a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue
+++ b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
@@ -1,57 +1,80 @@
 <template>
-  <v-form
-    v-if="archiveItemAttributes"
-    ref="form"
-    @submit.prevent="saveAndRedirect"
+  <v-dialog
+    v-model="showDialog"
+    max-width="600"
+    persistent
+    @keydown.esc="close"
   >
-    <v-card class="border">
-      <FileDrop @files-dropped="attachDroppedFiles">
-        <v-card-title>Knowledge Item</v-card-title>
+    <v-form
+      v-if="archiveItemAttributes"
+      ref="form"
+      @submit.prevent="saveAndClose"
+    >
+      <v-card elevation="10">
         <v-card-text>
-          <v-checkbox
-            v-model="archiveItemAttributes.confidentialityReceipt"
-            label="I confirm that I have received and agreed to the confidentiality terms."
-            class="mt-3"
-            :rules="[required]"
-            required
-            hide-details
-          />
+          <FileDrop @files-dropped="attachDroppedFiles">
+            <v-card-title>Knowledge Item</v-card-title>
+            <v-card-text>
+              <v-checkbox
+                v-model="archiveItemAttributes.confidentialityReceipt"
+                label="I confirm that I have received and agreed to the confidentiality terms."
+                class="mt-3"
+                :rules="[required]"
+                required
+                hide-details
+              />
+            </v-card-text>
+
+            <v-divider
+              thickness="2"
+              class="mb-4"
+            />
+
+            <v-card-title>Attachments</v-card-title>
+
+            <v-card-text>
+              <p class="mb-4">Drag and drop files or click the box below</p>
+              <EnhancedFileInput
+                v-model="files"
+                multiple
+                chips
+                clearable
+                label="Attachments"
+              />
+            </v-card-text>
+
+            <v-card-actions>
+              <v-btn
+                type="submit"
+                color="primary"
+                variant="elevated"
+                size="large"
+                :loading="isLoading"
+                text="Create"
+              />
+              <v-spacer />
+              <v-btn
+                variant="outlined"
+                color="secondary"
+                size="large"
+                :disabled="isLoading"
+                text="Cancel"
+                @click="close"
+              />
+            </v-card-actions>
+          </FileDrop>
         </v-card-text>
-
-        <v-divider
-          thickness="2"
-          class="mb-4"
-        />
-
-        <v-card-title>Attachments</v-card-title>
-
-        <v-card-text>
-          <p class="mb-4">Drag and drop files or click the box below</p>
-          <EnhancedFileInput
-            v-model="files"
-            multiple
-            chips
-            clearable
-            label="Attachments"
-          />
-
-          <v-btn
-            type="submit"
-            class="mt-5"
-            :loading="isLoading"
-            text="Create"
-          />
-        </v-card-text>
-      </FileDrop>
-    </v-card>
-  </v-form>
+      </v-card>
+    </v-form>
+  </v-dialog>
 </template>
 
 <script setup lang="ts">
 import { computed, ref, useTemplateRef, watchEffect } from "vue"
-import { useRouter } from "vue-router"
+import { useRouteQuery } from "@vueuse/router"
 import { isNil } from "lodash"
 
+import { booleanTransformer } from "@/utils/use-route-query-transformers"
 import { required } from "@/utils/validators"
 
 import Api from "@/api"
@@ -72,6 +95,14 @@ const props = defineProps<{
   informationSharingAgreement: InformationSharingAgreementAsShow
 }>()
 
+const emit = defineEmits<{
+  created: [archiveItemId: number]
+}>()
+
+const showDialog = useRouteQuery("showCreateArchiveItemDialog", "false", {
+  transform: booleanTransformer,
+})
+
 const archiveItemAttributes = ref<Partial<ArchiveItemCreationAttributes>>({
   title: "",
   securityLevel: SecurityLevel.LOW,
@@ -129,9 +160,8 @@ function attachDroppedFiles(droppedFiles: File[]) {
 const isLoading = ref(false)
 const form = useTemplateRef("form")
 const snack = useSnack()
-const router = useRouter()
 
-async function saveAndRedirect() {
+async function saveAndClose() {
   if (isNil(form.value)) return
 
   const { valid } = await form.value.validate()
@@ -148,12 +178,7 @@ async function saveAndRedirect() {
       files.value
     )
     snack.success("Item created.")
-    await router.push({
-      name: "archive-items/ArchiveItemInformationSharingAgreementsPage",
-      params: {
-        archiveItemId: archiveItem.id,
-      },
-    })
+    emit("created", archiveItem.id)
   } catch (error) {
     snack.error("Save failed!")
     throw error
@@ -161,4 +186,8 @@ async function saveAndRedirect() {
     isLoading.value = false
   }
 }
+
+function close() {
+  showDialog.value = false
+}
 </script>
diff --git a/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue b/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
index d6e6e0e4..9c097b2f 100644
--- a/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
+++ b/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
@@ -3,6 +3,15 @@
     v-bind="primaryButtonAttributes"
     :loading="isLoading"
   >
+    <template
+      v-if="!isNil(informationSharingAgreement) && isNil(archiveItemId)"
+      #dialogs
+    >
+      <InformationSharingAgreementArchiveItemCreateDialog
+        :information-sharing-agreement="informationSharingAgreement"
+        @created="goToInformationSharingAgreementsPage"
+      />
+    </template>
     <v-list-item
       :loading="isDownloadingSignedConfidentialityAcknowledgement"
       @click="downloadSignedConfidentialityAcknowledgement"
@@ -65,14 +74,19 @@
 
 <script setup lang="ts">
 import { computed, toRefs } from "vue"
+import { useRouter } from "vue-router"
+import { useRouteQuery } from "@vueuse/router"
 import { isNil } from "lodash"
 
+import { booleanTransformer } from "@/utils/use-route-query-transformers"
+
 import Api from "@/api"
 import useAuthenticatedDownload from "@/use/utils/use-authenticated-download"
 import useInformationSharingAgreement from "@/use/use-information-sharing-agreement"
 import useInformationSharingAgreementArchiveItems from "@/use/use-information-sharing-agreement-archive-items"
 
 import BaseActionsMenuBtnGroup from "@/components/common/BaseActionsMenuBtnGroup.vue"
+import InformationSharingAgreementArchiveItemCreateDialog from "@/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue"
 import InformationSharingAgreementRevertToDraftDialog from "@/components/information-sharing-agreements/InformationSharingAgreementRevertToDraftDialog.vue"
 
 const props = defineProps<{
@@ -83,6 +97,8 @@ const emit = defineEmits<{
   updated: [informationSharingAgreementId: number]
 }>()
 
+const router = useRouter()
+
 const { informationSharingAgreementId } = toRefs(props)
 const { informationSharingAgreement, isLoading } = useInformationSharingAgreement(
   informationSharingAgreementId
@@ -109,6 +125,10 @@ const { informationSharingAgreementArchiveItems } = useInformationSharingAgreeme
 const archiveItemId = computed(
   () => informationSharingAgreementArchiveItems.value?.at(0)?.archiveItemId
 )
+const showCreateArchiveItemDialog = useRouteQuery("showCreateArchiveItemDialog", "false", {
+  transform: booleanTransformer,
+})
+
 const primaryButtonAttributes = computed(() => {
   if (!isNil(archiveItemId.value)) {
     return {
@@ -123,12 +143,7 @@ const primaryButtonAttributes = computed(() => {
   } else {
     return {
       primaryButtonText: "Create Knowledge Item",
-      primaryButtonTo: {
-        name: "information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage",
-        params: {
-          informationSharingAgreementId: props.informationSharingAgreementId,
-        },
-      },
+      primaryButtonProps: { onClick: () => (showCreateArchiveItemDialog.value = true) },
     }
   }
 })
@@ -152,6 +167,10 @@ const {
   submit: downloadSignedConfidentialityReceipt,
   isLoading: isDownloadingSignedConfidentialityReceipt,
 } = useAuthenticatedDownload(generateSignedConfidentialityReceiptUrl)
+
+async function goToInformationSharingAgreementsPage() {
+  await router.push({ name: "InformationSharingAgreementsPage" })
+}
 </script>
 
 <style scoped></style>
diff --git a/web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue b/web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue
deleted file mode 100644
index 0487a1ee..00000000
--- a/web/src/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <v-skeleton-loader
-    v-if="isLoading || isNil(informationSharingAgreement)"
-    type="card"
-  />
-  <div v-else>
-    <InformationSharingAgreementBasicInformationCard
-      :title="informationSharingAgreement.title"
-      :purpose="informationSharingAgreement.purpose"
-      :external-group-contact-id="informationSharingAgreement.externalGroupContactId"
-      :external-group-contact-title="informationSharingAgreement.externalGroupContactTitle"
-      :internal-group-contact-id="informationSharingAgreement.internalGroupContactId"
-      :internal-group-contact-title="informationSharingAgreement.internalGroupContactTitle"
-      :internal-group-secondary-contact-id="
-        informationSharingAgreement.internalGroupSecondaryContactId
-      "
-    >
-      <template #title>
-        <v-icon
-          color="accent"
-          icon="mdi-information-outline"
-        />
-        ISA Basic Information
-      </template>
-    </InformationSharingAgreementBasicInformationCard>
-
-    <InformationSharingAgreementArchiveItemCreateForm
-      class="mt-4"
-      :information-sharing-agreement="informationSharingAgreement"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { isNil } from "lodash"
-import { computed } from "vue"
-
-import useBreadcrumbs, { BASE_CRUMB } from "@/use/use-breadcrumbs"
-import useInformationSharingAgreement from "@/use/use-information-sharing-agreement"
-
-import InformationSharingAgreementBasicInformationCard from "@/components/information-sharing-agreements/InformationSharingAgreementBasicInformationCard.vue"
-import InformationSharingAgreementArchiveItemCreateForm from "@/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateForm.vue"
-
-const props = defineProps<{
-  informationSharingAgreementId: string
-}>()
-
-const informationSharingAgreementIdAsNumber = computed(() =>
-  parseInt(props.informationSharingAgreementId)
-)
-
-const { informationSharingAgreement, isLoading } = useInformationSharingAgreement(
-  informationSharingAgreementIdAsNumber
-)
-
-const breadcrumbs = computed(() => {
-  return [
-    BASE_CRUMB,
-    {
-      title: "Information Sharing Agreements",
-      to: {
-        name: "InformationSharingAgreementsPage",
-      },
-    },
-    {
-      title: informationSharingAgreement.value?.title ?? "Loading...",
-      to: {
-        name: "information-sharing-agreements/InformationSharingAgreementPage",
-        params: {
-          informationSharingAgreementId: props.informationSharingAgreementId,
-        },
-      },
-    },
-  ]
-})
-
-useBreadcrumbs("Create Knowledge Item from Agreement", breadcrumbs)
-</script>
diff --git a/web/src/routes.ts b/web/src/routes.ts
index 739cc53f..8b07dc19 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -108,13 +108,6 @@ const routes: RouteRecordRaw[] = [
           },
         ],
       },
-      {
-        path: "information-sharing-agreements/:informationSharingAgreementId/archive-items/new",
-        name: "information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage",
-        component: () =>
-          import("@/pages/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemNewPage.vue"),
-        props: true,
-      },
       {
         path: "administration",
         children: [

From 70ba7ffdb27b2ed702980f610622860768caa7fb Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Mon, 29 Jun 2026 11:48:21 -0700
Subject: [PATCH 18/25] code simplification

---
 .../InformationSharingAgreementArchiveItemCreateDialog.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
index e735c4a6..b2fcb904 100644
--- a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
+++ b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
@@ -104,14 +104,7 @@ const showDialog = useRouteQuery("showCreateArchiveItemDialog", "false", {
 })
 
 const archiveItemAttributes = ref<Partial<ArchiveItemCreationAttributes>>({
-  title: "",
   securityLevel: SecurityLevel.LOW,
-  description: null,
-  sharingPurpose: null,
-  confidentialityReceipt: undefined,
-  yukonFirstNations: [],
-  tags: [],
-  archiveItemCategoriesAttributes: [],
 })
 
 const ACCESS_LEVEL_TO_SECURITY_LEVEL = {

From 3fa45a8829103f1101da79d1363482d82b6a0ef3 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Mon, 29 Jun 2026 11:53:30 -0700
Subject: [PATCH 19/25] Removing share button

---
 ...veItemInformationSharingAgreementsPage.vue | 40 ++-----------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/web/src/pages/archive-items/ArchiveItemInformationSharingAgreementsPage.vue b/web/src/pages/archive-items/ArchiveItemInformationSharingAgreementsPage.vue
index c4804d2a..7e0c2ea6 100644
--- a/web/src/pages/archive-items/ArchiveItemInformationSharingAgreementsPage.vue
+++ b/web/src/pages/archive-items/ArchiveItemInformationSharingAgreementsPage.vue
@@ -1,16 +1,6 @@
 <template>
   <v-card>
     <template #text>
-      <div
-        v-if="canShare && !hasExistingLink"
-        class="d-flex justify-end mb-4"
-      >
-        <ArchiveItemShareButton
-          :archive-item-id="archiveItemIdAsNumber"
-          :loading="isLoading"
-          @shared="refreshAll"
-        />
-      </div>
       <div>
         <InformationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator
           ref="informationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator"
@@ -24,13 +14,11 @@
 </template>
 
 <script setup lang="ts">
-import { computed, useTemplateRef } from "vue"
-import { isEmpty } from "lodash"
+import { computed } from "vue"
 
 import useArchiveItem from "@/use/use-archive-item"
 import useInformationSharingAgreementArchiveItems from "@/use/use-information-sharing-agreement-archive-items"
 
-import ArchiveItemShareButton from "@/components/archive-items/ArchiveItemShareButton.vue"
 import InformationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator from "@/components/information-sharing-agreement-archive-items/InformationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator.vue"
 
 const props = defineProps<{
@@ -38,9 +26,7 @@ const props = defineProps<{
 }>()
 
 const archiveItemIdAsNumber = computed(() => parseInt(props.archiveItemId))
-const { policy, isLoading, refresh: refreshArchiveItem } = useArchiveItem(archiveItemIdAsNumber)
-
-const canShare = computed(() => policy.value?.update)
+const { refresh: refreshArchiveItem } = useArchiveItem(archiveItemIdAsNumber)
 
 const informationSharingAgreementArchiveItemsWhereOptions = computed(() => ({
   archiveItemId: archiveItemIdAsNumber.value,
@@ -52,26 +38,8 @@ const informationSharingAgreementArchiveItemsQuery = computed(() => ({
   },
   perPage: 1,
 }))
-const {
-  informationSharingAgreementArchiveItems,
-  refresh: refreshInformationSharingAgreementArchiveItems,
-} = useInformationSharingAgreementArchiveItems(informationSharingAgreementArchiveItemsQuery)
-const hasExistingLink = computed(() => !isEmpty(informationSharingAgreementArchiveItems.value))
-
-const informationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator =
-  useTemplateRef<
-    InstanceType<
-      typeof InformationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator
-    >
-  >("informationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator")
-
-async function refreshAll() {
-  await Promise.all([
-    refreshArchiveItem(),
-    refreshInformationSharingAgreementArchiveItems(),
-    informationSharingAgreementArchiveItemsAsInformationSharingAgreementsEditDataIterator.value?.refresh(),
-  ])
-}
+const { refresh: refreshInformationSharingAgreementArchiveItems } =
+  useInformationSharingAgreementArchiveItems(informationSharingAgreementArchiveItemsQuery)
 
 async function refreshArchiveAndLinks() {
   await Promise.all([refreshArchiveItem(), refreshInformationSharingAgreementArchiveItems()])

From 33afd2cbd00ae293ff392c3db24cc387649e61e2 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Mon, 29 Jun 2026 11:57:46 -0700
Subject: [PATCH 20/25] Letting archive item create dialog manage its own show
 state

---
 ...onSharingAgreementArchiveItemCreateDialog.vue |  6 ++++++
 ...ormationSharingAgreementSignedActionsMenu.vue | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
index b2fcb904..507ab8eb 100644
--- a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
+++ b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
@@ -180,7 +180,13 @@ async function saveAndClose() {
   }
 }
 
+function open() {
+  showDialog.value = true
+}
+
 function close() {
   showDialog.value = false
 }
+
+defineExpose({ open })
 </script>
diff --git a/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue b/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
index 9c097b2f..03be1d36 100644
--- a/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
+++ b/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
@@ -8,6 +8,7 @@
       #dialogs
     >
       <InformationSharingAgreementArchiveItemCreateDialog
+        ref="createArchiveItemDialog"
         :information-sharing-agreement="informationSharingAgreement"
         @created="goToInformationSharingAgreementsPage"
       />
@@ -73,13 +74,10 @@
 </template>
 
 <script setup lang="ts">
-import { computed, toRefs } from "vue"
+import { computed, toRefs, useTemplateRef } from "vue"
 import { useRouter } from "vue-router"
-import { useRouteQuery } from "@vueuse/router"
 import { isNil } from "lodash"
 
-import { booleanTransformer } from "@/utils/use-route-query-transformers"
-
 import Api from "@/api"
 import useAuthenticatedDownload from "@/use/utils/use-authenticated-download"
 import useInformationSharingAgreement from "@/use/use-information-sharing-agreement"
@@ -125,9 +123,11 @@ const { informationSharingAgreementArchiveItems } = useInformationSharingAgreeme
 const archiveItemId = computed(
   () => informationSharingAgreementArchiveItems.value?.at(0)?.archiveItemId
 )
-const showCreateArchiveItemDialog = useRouteQuery("showCreateArchiveItemDialog", "false", {
-  transform: booleanTransformer,
-})
+const createArchiveItemDialog = useTemplateRef("createArchiveItemDialog")
+
+function openCreateArchiveItemDialog() {
+  createArchiveItemDialog.value?.open()
+}
 
 const primaryButtonAttributes = computed(() => {
   if (!isNil(archiveItemId.value)) {
@@ -143,7 +143,7 @@ const primaryButtonAttributes = computed(() => {
   } else {
     return {
       primaryButtonText: "Create Knowledge Item",
-      primaryButtonProps: { onClick: () => (showCreateArchiveItemDialog.value = true) },
+      primaryButtonProps: { onClick: () => openCreateArchiveItemDialog() },
     }
   }
 })

From 42daa5ae006f806e65274653155e76fa81bb6765 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Mon, 29 Jun 2026 12:15:00 -0700
Subject: [PATCH 21/25] Simplifiying frontend archive item creation futher

---
 .../archive-items/create-service.ts           | 50 +++++++++++------
 .../archive-items-api.ts                      | 10 +---
 ...haringAgreementArchiveItemCreateDialog.vue | 53 ++-----------------
 3 files changed, 40 insertions(+), 73 deletions(-)

diff --git a/api/src/services/information-sharing-agreements/archive-items/create-service.ts b/api/src/services/information-sharing-agreements/archive-items/create-service.ts
index c552d690..e8ec4040 100644
--- a/api/src/services/information-sharing-agreements/archive-items/create-service.ts
+++ b/api/src/services/information-sharing-agreements/archive-items/create-service.ts
@@ -4,6 +4,7 @@ import { isEmpty, isNil } from "lodash"
 import db, {
   ArchiveItem,
   ArchiveItemCategory,
+  ExternalOrganization,
   InformationSharingAgreement,
   InformationSharingAgreementArchiveItem,
   User,
@@ -11,6 +12,12 @@ import db, {
 import BaseService from "@/services/base-service"
 import { ArchiveItemFiles } from "@/services"
 
+const ACCESS_LEVEL_TO_SECURITY_LEVEL: Record<string, number> = {
+  [InformationSharingAgreement.AccessLevels.INTERNAL]: ArchiveItem.Levels.LOW,
+  [InformationSharingAgreement.AccessLevels.PROTECTED_AND_LIMITED]: ArchiveItem.Levels.MEDIUM,
+  [InformationSharingAgreement.AccessLevels.CONFIDENTIAL_AND_RESTRICTED]: ArchiveItem.Levels.HIGH,
+}
+
 export type ArchiveItemCategoriesAttributes = {
   categoryId: number
 }
@@ -36,40 +43,39 @@ export class CreateService extends BaseService {
 
   async perform(): Promise<ArchiveItem> {
     const {
-      title,
-      status,
-      isDecision,
       confidentialityReceipt,
-      securityLevel,
       archiveItemCategoriesAttributes,
       archiveItemFilesAttributes,
       ...optionalAttributes
     } = this.attributes
 
-    if (isNil(title) || isEmpty(title)) {
-      throw new Error("Title is required")
-    }
-
     if (isNil(confidentialityReceipt) || confidentialityReceipt !== true) {
       throw new Error("Confidentiality receipt is required, and must be true")
     }
 
-    if (isNil(securityLevel)) {
-      throw new Error("Security level is required")
+    const { title, purpose, authorizedApplication, accessLevel, externalGroupContactId } =
+      this.informationSharingAgreement
+
+    if (isNil(title) || isEmpty(title)) {
+      throw new Error("Title is required")
     }
 
-    // TODO: remove these from the model if they are unused by the UI.
-    const isDecisionOrFallback = isDecision ?? false
-    const statusOrFallback = status ?? ArchiveItem.Statuses.ACCEPTED
+    const accessLevelOrDefault = accessLevel ?? InformationSharingAgreement.AccessLevels.INTERNAL
+    const securityLevel = ACCESS_LEVEL_TO_SECURITY_LEVEL[accessLevelOrDefault]
+
+    const yukonFirstNations = await this.resolveYukonFirstNations(externalGroupContactId)
 
     return db.transaction(async () => {
       const archiveItem = await ArchiveItem.create({
         ...optionalAttributes,
         title,
         confidentialityReceipt,
-        isDecision: isDecisionOrFallback,
-        status: statusOrFallback,
+        isDecision: false,
+        status: ArchiveItem.Statuses.ACCEPTED,
         securityLevel,
+        sharingPurpose: authorizedApplication ?? undefined,
+        description: purpose ?? undefined,
+        yukonFirstNations: yukonFirstNations ?? undefined,
         userId: this.currentUser.id,
       })
 
@@ -104,6 +110,20 @@ export class CreateService extends BaseService {
     })
   }
 
+  private async resolveYukonFirstNations(
+    externalGroupContactId: number | null
+  ): Promise<string[] | null> {
+    if (isNil(externalGroupContactId)) return null
+
+    const organization = await ExternalOrganization.findOne({
+      include: [{ association: "users", attributes: [], where: { id: externalGroupContactId } }],
+    })
+
+    if (isNil(organization)) return null
+
+    return [organization.name]
+  }
+
   private async assignCategoriesToArchiveItem(
     archiveItemId: number,
     archiveItemCategoriesAttributes: { categoryId: number }[] | undefined
diff --git a/web/src/api/information-sharing-agreements/archive-items-api.ts b/web/src/api/information-sharing-agreements/archive-items-api.ts
index dbeed678..ceeb1956 100644
--- a/web/src/api/information-sharing-agreements/archive-items-api.ts
+++ b/web/src/api/information-sharing-agreements/archive-items-api.ts
@@ -1,17 +1,9 @@
 import http from "@/api/http-client"
 import { type ArchiveItemAsShow } from "@/api/archive-items-api"
-import { SecurityLevel } from "@/api/archive-items-api"
 
 export type ArchiveItemCreationAttributes = {
-  title: string
-  description: string | null
-  sharingPurpose: string | null
   confidentialityReceipt: boolean
-  yukonFirstNations: string[]
-  securityLevel: SecurityLevel
-  tags: string[]
-} & {
-  archiveItemCategoriesAttributes: {
+  archiveItemCategoriesAttributes?: {
     categoryId: number
   }[]
 }
diff --git a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
index 507ab8eb..14117f9b 100644
--- a/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
+++ b/web/src/components/information-sharing-agreements/archive-items/InformationSharingAgreementArchiveItemCreateDialog.vue
@@ -70,22 +70,16 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, useTemplateRef, watchEffect } from "vue"
+import { ref, useTemplateRef } from "vue"
 import { useRouteQuery } from "@vueuse/router"
-import { isNil } from "lodash"
 
 import { booleanTransformer } from "@/utils/use-route-query-transformers"
 import { required } from "@/utils/validators"
 
 import Api from "@/api"
 import { type ArchiveItemCreationAttributes } from "@/api/information-sharing-agreements/archive-items-api"
-import { SecurityLevel } from "@/api/archive-items-api"
-import {
-  InformationSharingAgreementAccessLevels,
-  type InformationSharingAgreementAsShow,
-} from "@/api/information-sharing-agreements-api"
+import { type InformationSharingAgreementAsShow } from "@/api/information-sharing-agreements-api"
 
-import useExternalOrganizations from "@/use/use-external-organizations"
 import useSnack from "@/use/use-snack"
 
 import EnhancedFileInput from "@/components/common/EnhancedFileInput.vue"
@@ -103,46 +97,7 @@ const showDialog = useRouteQuery("showCreateArchiveItemDialog", "false", {
   transform: booleanTransformer,
 })
 
-const archiveItemAttributes = ref<Partial<ArchiveItemCreationAttributes>>({
-  securityLevel: SecurityLevel.LOW,
-})
-
-const ACCESS_LEVEL_TO_SECURITY_LEVEL = {
-  [InformationSharingAgreementAccessLevels.INTERNAL]: SecurityLevel.LOW,
-  [InformationSharingAgreementAccessLevels.PROTECTED_AND_LIMITED]: SecurityLevel.MEDIUM,
-  [InformationSharingAgreementAccessLevels.CONFIDENTIAL_AND_RESTRICTED]: SecurityLevel.HIGH,
-}
-
-watchEffect(() => {
-  const { accessLevel, purpose, authorizedApplication, title } = props.informationSharingAgreement
-
-  const accessLevelOrDefault = accessLevel ?? InformationSharingAgreementAccessLevels.INTERNAL
-
-  archiveItemAttributes.value.securityLevel = ACCESS_LEVEL_TO_SECURITY_LEVEL[accessLevelOrDefault]
-  archiveItemAttributes.value.sharingPurpose = authorizedApplication
-  archiveItemAttributes.value.description = purpose
-  archiveItemAttributes.value.title = title
-})
-
-const NULL_USER_ID = -1
-const externalGroupContactId = computed(
-  () => props.informationSharingAgreement.externalGroupContactId
-)
-const externalOrganizationsQuery = computed(() => ({
-  filters: {
-    withUserId: externalGroupContactId.value ?? NULL_USER_ID,
-  },
-}))
-const { externalOrganizations } = useExternalOrganizations(externalOrganizationsQuery, {
-  skipWatchIf: () => isNil(externalGroupContactId.value),
-})
-const externalGroupContactOrganization = computed(() => externalOrganizations.value[0])
-
-watchEffect(() => {
-  if (isNil(externalGroupContactOrganization.value)) return
-
-  archiveItemAttributes.value.yukonFirstNations = [externalGroupContactOrganization.value.name]
-})
+const archiveItemAttributes = ref<Partial<ArchiveItemCreationAttributes>>({})
 
 const files = ref<File[]>([])
 
@@ -155,7 +110,7 @@ const form = useTemplateRef("form")
 const snack = useSnack()
 
 async function saveAndClose() {
-  if (isNil(form.value)) return
+  if (form.value === null) return
 
   const { valid } = await form.value.validate()
   if (!valid) {

From 33094660d6d126ea3cbef1d1b12aa3662e36f29f Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Wed, 15 Jul 2026 14:00:37 -0700
Subject: [PATCH 22/25] Throw error on invalid externalGroupContactId

---
 .../archive-items/create-service.ts                        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/src/services/information-sharing-agreements/archive-items/create-service.ts b/api/src/services/information-sharing-agreements/archive-items/create-service.ts
index e8ec4040..945631d0 100644
--- a/api/src/services/information-sharing-agreements/archive-items/create-service.ts
+++ b/api/src/services/information-sharing-agreements/archive-items/create-service.ts
@@ -119,9 +119,12 @@ export class CreateService extends BaseService {
       include: [{ association: "users", attributes: [], where: { id: externalGroupContactId } }],
     })
 
-    if (isNil(organization)) return null
+    if (isNil(organization)) {
+      throw new Error("External group contact is missing its associated external organization")
+    }
 
-    return [organization.name]
+    const { name } = organization
+    return [name]
   }
 
   private async assignCategoriesToArchiveItem(

From f59f2a579e2f2525ffd075a43834fb0ad41a0723 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Wed, 15 Jul 2026 14:57:57 -0700
Subject: [PATCH 23/25] ref name

---
 .../InformationSharingAgreementSignedActionsMenu.vue      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue b/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
index 03be1d36..099bf350 100644
--- a/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
+++ b/web/src/components/information-sharing-agreements/signed/InformationSharingAgreementSignedActionsMenu.vue
@@ -8,7 +8,7 @@
       #dialogs
     >
       <InformationSharingAgreementArchiveItemCreateDialog
-        ref="createArchiveItemDialog"
+        ref="informationSharingAgreementArchiveItemCreateDialogRef"
         :information-sharing-agreement="informationSharingAgreement"
         @created="goToInformationSharingAgreementsPage"
       />
@@ -123,10 +123,12 @@ const { informationSharingAgreementArchiveItems } = useInformationSharingAgreeme
 const archiveItemId = computed(
   () => informationSharingAgreementArchiveItems.value?.at(0)?.archiveItemId
 )
-const createArchiveItemDialog = useTemplateRef("createArchiveItemDialog")
+const informationSharingAgreementArchiveItemCreateDialogRef = useTemplateRef(
+  "informationSharingAgreementArchiveItemCreateDialogRef"
+)
 
 function openCreateArchiveItemDialog() {
-  createArchiveItemDialog.value?.open()
+  informationSharingAgreementArchiveItemCreateDialogRef.value?.open()
 }
 
 const primaryButtonAttributes = computed(() => {

From 75252502c2de9ef783957dd6ca5f5f28b74d1359 Mon Sep 17 00:00:00 2001
From: Caleb Burke <calebburke91@gmail.com>
Date: Wed, 15 Jul 2026 14:59:10 -0700
Subject: [PATCH 24/25] removing archiveItemCategoriesAttributes

---
 .../archive-items/create-service.ts           | 49 ++++++-------------
 .../archive-items-api.ts                      |  3 --
 2 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/api/src/services/information-sharing-agreements/archive-items/create-service.ts b/api/src/services/information-sharing-agreements/archive-items/create-service.ts
index 945631d0..0581b610 100644
--- a/api/src/services/information-sharing-agreements/archive-items/create-service.ts
+++ b/api/src/services/information-sharing-agreements/archive-items/create-service.ts
@@ -3,7 +3,6 @@ import { isEmpty, isNil } from "lodash"
 
 import db, {
   ArchiveItem,
-  ArchiveItemCategory,
   ExternalOrganization,
   InformationSharingAgreement,
   InformationSharingAgreementArchiveItem,
@@ -18,17 +17,12 @@ const ACCESS_LEVEL_TO_SECURITY_LEVEL: Record<string, number> = {
   [InformationSharingAgreement.AccessLevels.CONFIDENTIAL_AND_RESTRICTED]: ArchiveItem.Levels.HIGH,
 }
 
-export type ArchiveItemCategoriesAttributes = {
-  categoryId: number
-}
-
 export type ArchiveItemFilesAttributes = {
   name: string
   path: string
 }
 
 export type ArchiveItemCreationAttributes = Partial<CreationAttributes<ArchiveItem>> & {
-  archiveItemCategoriesAttributes?: ArchiveItemCategoriesAttributes[]
   archiveItemFilesAttributes?: ArchiveItemFilesAttributes[]
 }
 
@@ -42,12 +36,8 @@ export class CreateService extends BaseService {
   }
 
   async perform(): Promise<ArchiveItem> {
-    const {
-      confidentialityReceipt,
-      archiveItemCategoriesAttributes,
-      archiveItemFilesAttributes,
-      ...optionalAttributes
-    } = this.attributes
+    const { confidentialityReceipt, archiveItemFilesAttributes, ...optionalAttributes } =
+      this.attributes
 
     if (isNil(confidentialityReceipt) || confidentialityReceipt !== true) {
       throw new Error("Confidentiality receipt is required, and must be true")
@@ -73,9 +63,9 @@ export class CreateService extends BaseService {
         isDecision: false,
         status: ArchiveItem.Statuses.ACCEPTED,
         securityLevel,
-        sharingPurpose: authorizedApplication ?? undefined,
-        description: purpose ?? undefined,
-        yukonFirstNations: yukonFirstNations ?? undefined,
+        sharingPurpose: authorizedApplication,
+        description: purpose,
+        yukonFirstNations,
         userId: this.currentUser.id,
       })
 
@@ -85,8 +75,6 @@ export class CreateService extends BaseService {
         await this.uploadFilesForArchiveItem(archiveItem.id, archiveItemFilesAttributes)
       }
 
-      await this.assignCategoriesToArchiveItem(archiveItem.id, archiveItemCategoriesAttributes)
-
       return archiveItem.reload({
         include: ["categories", "accessGrants", "user"],
       })
@@ -116,7 +104,15 @@ export class CreateService extends BaseService {
     if (isNil(externalGroupContactId)) return null
 
     const organization = await ExternalOrganization.findOne({
-      include: [{ association: "users", attributes: [], where: { id: externalGroupContactId } }],
+      include: [
+        {
+          association: "users",
+          attributes: [],
+          where: {
+            id: externalGroupContactId,
+          },
+        },
+      ],
     })
 
     if (isNil(organization)) {
@@ -126,23 +122,6 @@ export class CreateService extends BaseService {
     const { name } = organization
     return [name]
   }
-
-  private async assignCategoriesToArchiveItem(
-    archiveItemId: number,
-    archiveItemCategoriesAttributes: { categoryId: number }[] | undefined
-  ): Promise<void> {
-    if (isNil(archiveItemCategoriesAttributes) || isEmpty(archiveItemCategoriesAttributes)) {
-      return
-    }
-
-    const archiveItemCategoriesAttributesWithArchiveItemId = archiveItemCategoriesAttributes.map(
-      ({ categoryId }) => ({
-        archiveItemId,
-        categoryId,
-      })
-    )
-    await ArchiveItemCategory.bulkCreate(archiveItemCategoriesAttributesWithArchiveItemId)
-  }
 }
 
 export default CreateService
diff --git a/web/src/api/information-sharing-agreements/archive-items-api.ts b/web/src/api/information-sharing-agreements/archive-items-api.ts
index ceeb1956..7b4c248a 100644
--- a/web/src/api/information-sharing-agreements/archive-items-api.ts
+++ b/web/src/api/information-sharing-agreements/archive-items-api.ts
@@ -3,9 +3,6 @@ import { type ArchiveItemAsShow } from "@/api/archive-items-api"
 
 export type ArchiveItemCreationAttributes = {
   confidentialityReceipt: boolean
-  archiveItemCategoriesAttributes?: {
-    categoryId: number
-  }[]
 }
 
 export const archiveItemsApi = {

From ec8a3fb7add116b3c7b79fab2ad37af38553ed25 Mon Sep 17 00:00:00 2001
From: Marlen Brunner <klondikemarlen@gmail.com>
Date: Tue, 14 Jul 2026 08:11:21 -0700
Subject: [PATCH 25/25] :memo: Repair Traditional Knowledge guidance links.

Fix stale migration, template, and workflow links so the shared strict guidance audit passes.
---
 README.md                           |  2 +-
 agents/README.md                    |  2 +-
 agents/templates/README.md          |  2 +-
 agents/workflows/create-admin-ui.md | 18 +++++++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 1a14cc80..99e3dedc 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ This project is using [knex](https://knexjs.org/guide/migrations.html#migration-
 
 NOTE: Migrations should use snake_case. While database table and column names use snake_case, we are using Sequelize for our models so that we get camelCase to match the JS standard, in the JS section of the codebase.
 
-1. To create a new migration from the template [sample-migration](./api/src/db/template/sample-migration.ts) do:
+1. To create a new migration from the template [sample-migration](./api/src/db/templates/sample-migration.ts) do:
 
    ```bash
    dev migrate make create-users-table
diff --git a/agents/README.md b/agents/README.md
index 1128d745..f8fb55e5 100644
--- a/agents/README.md
+++ b/agents/README.md
@@ -182,7 +182,7 @@ ls -li .cursor/workflows/
 
 If you need agent-specific versions, you can:
 
-1. **Keep in `agents/[agent-name]/`** instead of hardlinking:
+1. **Keep in a dedicated `agents/` subdirectory for that agent** instead of hardlinking:
    ```bash
    mkdir -p agents/claude/workflows
    cp agents/workflows/create-admin-ui.md agents/claude/workflows/
diff --git a/agents/templates/README.md b/agents/templates/README.md
index a2b4b86d..0a742a7b 100644
--- a/agents/templates/README.md
+++ b/agents/templates/README.md
@@ -27,7 +27,7 @@ templates/
 ## Usage
 
 Templates are referenced by workflows. See:
-- [create-admin-ui](../workflows/create-admin-ui/) - Full CRUD admin interface
+- [create-admin-ui](../workflows/create-admin-ui.md) - Full CRUD admin interface
 
 Each template file contains:
 1. Location path for the new file
diff --git a/agents/workflows/create-admin-ui.md b/agents/workflows/create-admin-ui.md
index 8ba6c473..1a9b7eaa 100644
--- a/agents/workflows/create-admin-ui.md
+++ b/agents/workflows/create-admin-ui.md
@@ -37,11 +37,11 @@ Templates are located in `agents/templates/` for reuse across workflows.
 
 | Template | Location | Description |
 |----------|----------|-------------|
-| [Model](../../templates/backend/model.md) | `api/src/models/` | Sequelize model with scopes |
-| [Controller](../../templates/backend/controller.md) | `api/src/controllers/` | CRUD endpoints |
-| [Policy](../../templates/backend/policy.md) | `api/src/policies/` | Authorization rules |
-| [Services](../../templates/backend/services.md) | `api/src/services/{resources}/` | Create, Update, Destroy |
-| [Serializers](../../templates/backend/serializers.md) | `api/src/serializers/{resources}/` | Index, Show, Reference |
+| [Model](../templates/backend/model.md) | `api/src/models/` | Sequelize model with scopes |
+| [Controller](../templates/backend/controller.md) | `api/src/controllers/` | CRUD endpoints |
+| [Policy](../templates/backend/policy.md) | `api/src/policies/` | Authorization rules |
+| [Services](../templates/backend/services.md) | `api/src/services/{resources}/` | Create, Update, Destroy |
+| [Serializers](../templates/backend/serializers.md) | `api/src/serializers/{resources}/` | Index, Show, Reference |
 
 **Integration Points:**
 - `api/src/controllers/index.ts` - Export controller
@@ -52,10 +52,10 @@ Templates are located in `agents/templates/` for reuse across workflows.
 
 | Template | Location | Description |
 |----------|----------|-------------|
-| [API Client](../../templates/frontend/api-client.md) | `web/src/api/` | Type-safe HTTP client |
-| [Composables](../../templates/frontend/composables.md) | `web/src/use/` | Reactive data fetching |
-| [Components](../../templates/frontend/components.md) | `web/src/components/{resources}/` | DataTable, Forms, UniqueTextField |
-| [Pages](../../templates/frontend/pages.md) | `web/src/pages/admin/{resources}/` | List, New, Edit pages |
+| [API Client](../templates/frontend/api-client.md) | `web/src/api/` | Type-safe HTTP client |
+| [Composables](../templates/frontend/composables.md) | `web/src/use/` | Reactive data fetching |
+| [Components](../templates/frontend/components.md) | `web/src/components/{resources}/` | DataTable, Forms, UniqueTextField |
+| [Pages](../templates/frontend/pages.md) | `web/src/pages/admin/{resources}/` | List, New, Edit pages |
 
 **Integration Points:**
 - `web/src/routes.ts` - Add routes