Jul22

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

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/

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

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

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 ?? "",
       department_branch_unit_hierarchy: departmentBranchUnitHierarchy,
       has_additional_access_restrictions: this.record.hasAdditionalAccessRestrictions ?? false,
       additional_access_restrictions: this.record.additionalAccessRestrictions ?? "",

api/src/services/information-sharing-agreements/archive-items/create-service.ts

@@ -3,16 +3,18 @@ import { isEmpty, isNil } from "lodash"
 
 import db, {
   ArchiveItem,
-  ArchiveItemCategory,
+  ExternalOrganization,
   InformationSharingAgreement,
   InformationSharingAgreementArchiveItem,
   User,
 } from "@/models"
 import BaseService from "@/services/base-service"
 import { ArchiveItemFiles } from "@/services"
 
-export type ArchiveItemCategoriesAttributes = {
-  categoryId: number
+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 ArchiveItemFilesAttributes = {
@@ -21,7 +23,6 @@ export type ArchiveItemFilesAttributes = {
 }
 
 export type ArchiveItemCreationAttributes = Partial<CreationAttributes<ArchiveItem>> & {
-  archiveItemCategoriesAttributes?: ArchiveItemCategoriesAttributes[]
   archiveItemFilesAttributes?: ArchiveItemFilesAttributes[]
 }
 
@@ -35,41 +36,36 @@ 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")
-    }
+    const { confidentialityReceipt, archiveItemFilesAttributes, ...optionalAttributes } =
+      this.attributes
 
     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,
+        description: purpose,
+        yukonFirstNations,
         userId: this.currentUser.id,
       })
 
@@ -79,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"],
       })
@@ -104,21 +98,29 @@ export class CreateService extends BaseService {
     })
   }
 
-  private async assignCategoriesToArchiveItem(
-    archiveItemId: number,
-    archiveItemCategoriesAttributes: { categoryId: number }[] | undefined
-  ): Promise<void> {
-    if (isNil(archiveItemCategoriesAttributes) || isEmpty(archiveItemCategoriesAttributes)) {
-      return
+  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)) {
+      throw new Error("External group contact is missing its associated external organization")
     }
 
-    const archiveItemCategoriesAttributesWithArchiveItemId = archiveItemCategoriesAttributes.map(
-      ({ categoryId }) => ({
-        archiveItemId,
-        categoryId,
-      })
-    )
-    await ArchiveItemCategory.bulkCreate(archiveItemCategoriesAttributesWithArchiveItemId)
+    const { name } = organization
+    return [name]
   }
 }
 

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."

web/src/api/information-sharing-agreements/archive-items-api.ts

@@ -1,19 +1,8 @@
 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: {
-    categoryId: number
-  }[]
 }
 
 export const archiveItemsApi = {

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,
     },

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,
     },