Merge pull request #6 from icefoganalytics/main

Update from IceFog

README.md

@@ -35,7 +35,7 @@
    ```bash
    VITE_AUTH0_DOMAIN=https://dev-0tc6bn14.eu.auth0.com
    VITE_AUTH0_AUDIENCE=testing
-   VITE_AUTH0_CLIENT_ID=mS8zklFSgatWX3v1OCQgVpEq5MixCm4k
+   VITE_AUTH0_CLIENT_ID=ZHjPOeCwYBov6eR1lxGOVYhYi4VPV8eU
    ```
 
 3. Go back to the top level directory.
@@ -268,7 +268,7 @@ Files:
 
    VITE_APPLICATION_NAME=Internal Data Portal
    VITE_AUTH0_DOMAIN=https://dev-0tc6bn14.eu.auth0.com
-   VITE_AUTH0_CLIENT_ID=mS8zklFSgatWX3v1OCQgVpEq5MixCm4k
+   VITE_AUTH0_CLIENT_ID=ZHjPOeCwYBov6eR1lxGOVYhYi4VPV8eU
    VITE_AUTH0_AUDIENCE=testing
 
    FRONTEND_URL=http://localhost:8080

_Design/Entity Relationship Diagrams.wsd

@@ -6,13 +6,63 @@ entity "access_grants" {
   * owner_id : int <<FK>>
   * grant_level : nvarchar(255)
   * access_type : nvarchar(255)
-  requestor_id : int <<FK>>
+  support_id : int <<FK>>
   is_project_description_required : bit
   created_at : datetime2(0)
   updated_at : datetime2(0)
   deleted_at : datetime2(0)
 }
 
+entity "access_requests" {
+  * id : int <<PK>>
+  --
+  * dataset_id : int <<FK>>
+  * access_grant_id : int <<FK>>
+  * requestor_id : int <<FK>>
+  * access_code : nvarchar(255)
+  denier_id : int <<FK>>
+  approver_id : int <<FK>>
+  revoker_id : int <<FK>>
+  project_name: nvarchar(255)
+  project_description: nvarchar(MAX)
+  approved_at : datetime2(0)
+  denied_at : datetime2(0)
+  revoked_at : datetime2(0)
+  denial_reason: nvarchar(MAX)
+  created_at : datetime2(0)
+  updated_at : datetime2(0)
+  deleted_at : datetime2(0)
+}
+
+entity "dataset_fields" {
+  * id : int <<PK>>
+  --
+  * dataset_id : int <<FK>>
+  * name : nvarchar(255)
+  * display_name : nvarchar(255)
+  * data_type : nvarchar(100)
+  description : nvarchar(1000)
+  note : nvarchar(MAX)
+  created_at : datetime2(0)
+  updated_at : datetime2(0)
+  deleted_at : datetime2(0)
+}
+
+entity "dataset_stewardships" {
+  * id : int <<PK>>
+  --
+  * dataset_id : int <<FK>>
+  * owner_id : int <<FK>>
+  * support_id : int <<FK>>
+  * department : int <<FK>>
+  division_id : int <<FK>>
+  branch_id : int <<FK>>
+  unit_id : int <<FK>>
+  created_at : datetime2(0)
+  updated_at : datetime2(0)
+  deleted_at : datetime2(0)
+}
+
 entity "datasets" {
   * id : int <<PK>>
   --
@@ -23,7 +73,6 @@ entity "datasets" {
   * description : nvarchar(MAX)
   subscription_url : nvarchar(1000)
   subscription_access_code : nvarchar(255)
-  is_subscribable : bit
   is_spatial_data : bit
   is_live_data : bit
   terms_of_use : nvarchar(MAX)
@@ -49,21 +98,12 @@ entity "roles" {
   deleted_at : datetime2(0)
 }
 
-entity "stewardship_evolutions" {
+entity "taggings" {
   * id : int <<PK>>
   --
-  * dataset_id : int <<FK>>
-  * owner_id : int <<FK>>
-  * support_id : int <<FK>>
-  * owner_name : nvarchar(100)
-  * owner_position : nvarchar(255)
-  * support_name : nvarchar(100)
-  * support_email : nvarchar(100)
-  * support_position : nvarchar(255)
-  department : nvarchar(255)
-  division : nvarchar(255)
-  branch : nvarchar(255)
-  unit : nvarchar(255)
+  * tag_id : int <<FK>>
+  * taggable_id : int - foreign key
+  * taggable_type : nvarchar(255)
   created_at : datetime2(0)
   updated_at : datetime2(0)
   deleted_at : datetime2(0)
@@ -78,30 +118,15 @@ entity "tags" {
   deleted_at : datetime2(0)
 }
 
-entity "taggings" {
-  * id : int <<PK>>
-  --
-  * tag_id : int <<FK>>
-  * taggable_id : int - foreign key
-  * taggable_type : nvarchar(255)
-  created_at : datetime2(0)
-  updated_at : datetime2(0)
-  deleted_at : datetime2(0)
-}
 
-entity "users" {
+entity "user_group_memberships" {
   * id : int <<PK>>
   --
-  * email : nvarchar(100)
-  * auth0_subject : nvarchar(100)
-  first_name : nvarchar(100)
-  last_name : nvarchar(100)
-  position : nvarchar(100)
-  department : nvarchar(100)
-  division : nvarchar(100)
-  branch : nvarchar(100)
-  unit : nvarchar(100)
-  last_employee_directory_sync_at: datetime2(0)
+  * userId : int <<FK>>
+  * department_id : int <<FK>>
+  division_id : int <<FK>>
+  branch_id : int <<FK>>
+  unit_id : int <<FK>>
   created_at : datetime2(0)
   updated_at : datetime2(0)
   deleted_at : datetime2(0)
@@ -120,34 +145,50 @@ entity "user_groups" {
   deleted_at : datetime2(0)
 }
 
-entity "user_group_memberships" {
+entity "users" {
   * id : int <<PK>>
   --
-  * userId : int <<FK>>
-  * department_id : int <<FK>>
-  division_id : int <<FK>>
-  branch_id : int <<FK>>
-  unit_id : int <<FK>>
+  * email : nvarchar(100)
+  * auth0_subject : nvarchar(100)
+  first_name : nvarchar(100)
+  last_name : nvarchar(100)
+  position : nvarchar(100)
+  department : nvarchar(100)
+  division : nvarchar(100)
+  branch : nvarchar(100)
+  unit : nvarchar(100)
+  last_employee_directory_sync_at: datetime2(0)
   created_at : datetime2(0)
   updated_at : datetime2(0)
   deleted_at : datetime2(0)
 }
 
 ' Define relationships
-users }o--|| roles : user_id
-users }o--|| datasets : owner_id
-users }o--|| datasets : creator_id
-datasets }o--|| stewardship_evolutions : dataset_id
-users }o--|| stewardship_evolutions : owner_id
-users }o--|| stewardship_evolutions : support_id
-users |o--|| user_group_memberships : user_id
+access_grants }o--|| access_requests : access_grant_id
+datasets }o--|| access_grants : dataset_id
+datasets }o--|| dataset_fields : dataset_id
+datasets }o--|| taggings : taggable_id, tagging_type
+datasets |o--|| dataset_stewardships : dataset_id
+datasets }o--|| access_requests : dataset_id
+taggings ||--o{ tags : tag_id
+user_groups }o--|| dataset_stewardships : branch_id
+user_groups }o--|| dataset_stewardships : department_id
+user_groups }o--|| dataset_stewardships : division_id
+user_groups }o--|| dataset_stewardships : unit_id
+user_groups }o--|| user_group_memberships : branch_id
 user_groups }o--|| user_group_memberships : department_id
 user_groups }o--|| user_group_memberships : division_id
-user_groups }o--|| user_group_memberships : branch_id
 user_groups }o--|| user_group_memberships : unit_id
-datasets }o--|| taggings : taggable_id, tagging_type
-taggings ||--o{ tags : tag_id
-datasets }o--|| access_grants : dataset_id
 users }o--|| access_grants : owner_id
-users }o--|| access_grants : requestor_id
+users }o--|| access_grants : support_id
+users }o--|| access_requests : requestor_id
+users }o--|| access_requests : denier_id
+users }o--|| access_requests : approver_id
+users }o--|| access_requests : revoker_id
+users }o--|| dataset_stewardships : owner_id
+users }o--|| dataset_stewardships : support_id
+users }o--|| datasets : creator_id
+users }o--|| datasets : owner_id
+users }o--|| roles : user_id
+users |o--|| user_group_memberships : user_id
 @enduml

api/package.json

@@ -28,6 +28,7 @@
     "jwks-rsa": "^3.1.0",
     "lodash": "^4.17.21",
     "luxon": "^3.4.4",
+    "qs": "^6.11.2",
     "sequelize": "^6.35.2",
     "slugify": "^1.6.6",
     "tedious": "^16.6.1",
@@ -40,6 +41,7 @@
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.202",
     "@types/luxon": "^3.4.2",
+    "@types/qs": "^6.9.11",
     "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",

api/src/app.ts

@@ -2,11 +2,20 @@ import express, { type Request, type Response } from "express"
 import cors from "cors"
 import path from "path"
 import helmet from "helmet"
+import qs from "qs"
 
 import { FRONTEND_URL } from "@/config"
 import router from "@/router"
 
 export const app = express()
+
+// For parsing nulls out of query strings
+// See web/src/api/http-client.ts
+app.set("query parser", (params: string) => {
+  return qs.parse(params, {
+    strictNullHandling: true,
+  })
+})
 app.use(express.json()) // for parsing application/json
 app.use(express.urlencoded({ extended: true })) // for parsing application/x-www-form-urlencoded
 app.use(