Integrated workbox with database w/ proper entities instead of JSON

final-hill · Oct 1, 2024 · 9baaecf · 9baaecf
1 parent 417a55f
commit 9baaecf
Show file tree

Hide file tree

Showing 126 changed files with 2,202 additions and 549 deletions.
diff --git a/.github/workflows/azure-deploy.yml b/.github/workflows/azure-deploy.yml
@@ -51,6 +51,9 @@ jobs:
             nuxtAuthTenantId="${{ secrets.NUXT_AUTH_TENANT_ID }}"
             nuxtAuthAuthorityDomain="${{ secrets.NUXT_AUTH_AUTHORITY_DOMAIN }}"
             nuxtAuthPrimaryUserFlow="${{ secrets.NUXT_AUTH_PRIMARY_USER_FLOW }}"
+            nuxtAzureOpenaiApiKey="${{ secrets.NUXT_AZURE_OPENAI_API_KEY }}"
+            nuxtAzureOpenaiApiVersion="${{ secrets.NUXT_AZURE_OPENAI_API_VERSION }}",
+            nuxtAzureOpenaiEndpoint="${{ secrets.NUXT_AZURE_OPENAI_ENDPOINT }}"
           scope: 'resourcegroup'
           deploymentMode: 'Incremental'
           failOnStdErr: false
@@ -99,6 +102,9 @@ jobs:
           echo "SLACK_ADMIN_MEMBER_ID=${{secrets.SLACK_ADMIN_MEMBER_ID}}" >> .env
           echo "SLACK_BOT_TOKEN=${{secrets.SLACK_BOT_TOKEN}}" >> .env
           echo "SLACK_SIGNING_SECRET=${{secrets.SLACK_SIGNING_SECRET}}" >> .env
+          echo "NUXT_AZURE_OPENAI_API_KEY=${{secrets.NUXT_AZURE_OPENAI_API_KEY}}" >> .env
+          echo "NUXT_AZURE_OPENAI_API_VERSION=${{secrets.NUXT_AZURE_OPENAI_API_VERSION}}" >> .env
+          echo "NUXT_AZURE_OPENAI_ENDPOINT=${{secrets.NUXT_AZURE_OPENAI_ENDPOINT}}" >> .env
       - name: Build Application
         run: npm run build
       - name: Generate PWA Assets
@@ -152,6 +158,9 @@ jobs:
             nuxtAuthTenantId="${{ secrets.NUXT_AUTH_TENANT_ID }}"
             nuxtAuthAuthorityDomain="${{ secrets.NUXT_AUTH_AUTHORITY_DOMAIN }}"
             nuxtAuthPrimaryUserFlow="${{ secrets.NUXT_AUTH_PRIMARY_USER_FLOW }}"
+            nuxtAzureOpenaiApiKey="${{ secrets.NUXT_AZURE_OPENAI_API_KEY }}"
+            nuxtAzureOpenaiApiVersion="${{ secrets.NUXT_AZURE_OPENAI_API_VERSION }}",
+            nuxtAzureOpenaiEndpoint="${{ secrets.NUXT_AZURE_OPENAI_ENDPOINT }}"
           scope: 'resourcegroup'
           failOnStdErr: false
       - name: logout
@@ -220,6 +229,9 @@ jobs:
           echo "SLACK_ADMIN_MEMBER_ID=${{secrets.SLACK_ADMIN_MEMBER_ID}}" >> .env
           echo "SLACK_BOT_TOKEN=${{secrets.SLACK_BOT_TOKEN}}" >> .env
           echo "SLACK_SIGNING_SECRET=${{secrets.SLACK_SIGNING_SECRET}}" >> .env
+          echo "NUXT_AZURE_OPENAI_API_KEY=${{secrets.NUXT_AZURE_OPENAI_API_KEY}}" >> .env
+          echo "NUXT_AZURE_OPENAI_API_VERSION=${{secrets.NUXT_AZURE_OPENAI_API_VERSION}}" >> .env
+          echo "NUXT_AZURE_OPENAI_ENDPOINT=${{secrets.NUXT_AZURE_OPENAI_ENDPOINT}}" >> .env
       - name: Login to Azure
         uses: azure/login@v2
         with:

diff --git a/azure/bicep/main.bicep b/azure/bicep/main.bicep
@@ -43,6 +43,12 @@ param nuxtAuthTenantId string
 param nuxtAuthAuthorityDomain string
 @secure()
 param nuxtAuthPrimaryUserFlow string
+@secure()
+param nuxtAzureOpenaiApiKey string
+@secure()
+param nuxtAzureOpenaiApiVersion string
+@secure()
+param nuxtAzureOpenaiEndpoint string
 
 module appInsights './modules/appInsights.bicep' = {
   name: 'appInsights'
@@ -91,5 +97,8 @@ module appService './modules/appService.bicep' = {
     nuxtAuthTenantName: nuxtAuthTenantName
     nuxtOrigin: nuxtOrigin
     nuxtSessionPassword: nuxtSessionPassword
+    nuxtAzureOpenaiApiKey: nuxtAzureOpenaiApiKey
+    nuxtAzureOpenaiApiVersion: nuxtAzureOpenaiApiVersion
+    nuxtAzureOpenaiEndpoint: nuxtAzureOpenaiEndpoint
   }
 }
diff --git a/azure/bicep/modules/appService.bicep b/azure/bicep/modules/appService.bicep
@@ -40,6 +40,12 @@ param nuxtAuthTenantId string
 param nuxtAuthAuthorityDomain string
 @secure()
 param nuxtAuthPrimaryUserFlow string
+@secure()
+param nuxtAzureOpenaiApiKey string
+@secure()
+param nuxtAzureOpenaiApiVersion string
+@secure()
+param nuxtAzureOpenaiEndpoint string
 
 resource appServicePlan 'Microsoft.Web/serverfarms@2023-12-01' = {
   name: toLower('plan-${name}')
@@ -179,6 +185,18 @@ resource appService 'Microsoft.Web/sites@2023-12-01' = {
           name: 'NUXT_AUTH_PRIMARY_USER_FLOW'
           value: nuxtAuthPrimaryUserFlow
         }
+        {
+          name: 'NUXT_AZURE_OPENAI_API_KEY'
+          value: nuxtAzureOpenaiApiKey
+        }
+        {
+          name: 'NUXT_AZURE_OPENAI_API_VERSION'
+          value: nuxtAzureOpenaiApiVersion
+        }
+        {
+          name: 'NUXT_AZURE_OPENAI_ENDPOINT'
+          value: nuxtAzureOpenaiEndpoint
+        }
       ]
     }
   }

diff --git a/components/WorkboxDataView.vue b/components/WorkboxDataView.vue
@@ -1,21 +1,18 @@
 <script lang="ts" setup>
+import type { Requirement } from '~/server/domain/requirements/Requirement';
+import type { ParsedRequirement } from '~/server/domain/requirements/ParsedRequirement.js';
 
 type RowType = { type: string; id: string; name: string; }
 
 const props = defineProps<{
-    parsedRequirements: {
-        id: string,
-        jsonResult: {
-            [type: string]: RowType[]
-        }
-    },
+    parsedRequirement: ParsedRequirement,
     onApprove: (parentId: string, itemId: string) => Promise<void>,
     onReject: (parentId: string, itemId: string) => Promise<void>
 }>()
 
 const confirm = useConfirm()
 
-const requirements = Object.values(props.parsedRequirements.jsonResult)
+const requirements: Requirement[][] = Object.values(props.parsedRequirement).filter(Array.isArray)
 
 const onReject = (parentId: string, item: RowType) => new Promise<void>((resolve, _reject) => {
     confirm.require({
@@ -45,12 +42,14 @@ const onReject = (parentId: string, item: RowType) => new Promise<void>((resolve
                     </template>
                     <Column v-for="col of Object.keys(requirements[0])" :key="col" :field="col" :header="col">
                     </Column>
+                    <!--
                     <Column header="Actions" frozen align-frozen="right">
                         <template #body="{ data }">
                             <Button icon="pi pi-eye" class="text rounded mr-2" />
                             <Button icon="pi pi-trash" text rounded severity="danger" />
                         </template>
                     </Column>
+                -->
                 </DataTable>
             </div>
         </template>