Merge branch 'gurj/refresh-pw' of https://github.com/bcgov/traction i…

…nto gurj/refresh-pw
bcgov · Oct 25, 2023 · 2dd2790 · 2dd2790
2 parents 13a724a + 9d28b44
commit 2dd2790
Show file tree

Hide file tree

Showing 22 changed files with 453 additions and 167 deletions.
diff --git a/charts/traction/templates/ui/configmap.yaml b/charts/traction/templates/ui/configmap.yaml
@@ -32,4 +32,7 @@ data:
   UX_COVERIMAGE_COPYRIGHT: {{ .Values.ui.ux.coverImageCopyright | quote }}
   UX_OWNER: {{ .Values.ui.ux.owner | quote }}
   UX_SIDEBAR_TITLE: {{ .Values.ui.ux.sidebarTitle | quote }}
+  UX_INFO_BANNER_MESSAGE: {{ .Values.ui.ux.infoBanner.message | quote }}
+  UX_INFO_BANNER_MESSAGE_LEVEL: {{ .Values.ui.ux.infoBanner.messageLevel | quote }}
+  UX_INFO_BANNER_SHOW_MESSAGE: {{ .Values.ui.ux.infoBanner.showMessage | quote }}
 {{- end -}}
diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
@@ -147,7 +147,7 @@ acapy:
       is_production: true
       is_write: true
       genesis_url: "http://dev.bcovrin.vonx.io/genesis"
-      endorser_did: "VGA8QzjQaL5xkXRHjAgQcj"
+      endorser_did: "N5bxk3jWkpZ2tEaMtjPjPa"
       endorser_alias: "bcovrin-dev-endorser"
 
   ## @section Wallet Storage configuration
@@ -612,6 +612,20 @@ ui:
     ## @param ui.ux.coverImageCopyright
     coverImageCopyright: "Photo by Kristoffer Fredriksson on StockSnap"
 
+    ## Information banner settings
+    ##
+    infoBanner:
+      ## @param ui.ux.infoBanner.message
+      message: ""
+      ## @param ui.ux.infoBanner.messageLevel <info|warn|error|success>
+      messageLevel: info
+      ## @param ui.ux.infoBanner.showMessage Show the info banner <boolean>
+      showMessage: false
+      ## @param ui.ux.infoBanner.environmentName Environment name to be displayed eg. "Development"
+      environmentName: ""
+      ## @param ui.ux.infoBanner.showEnvironmentName Show the environment name <boolean>
+      showEnvironmentName: false
+
   ariesDetails:
     ## @param ui.ariesDetails.ledgerDescription Ledger description
     ledgerDescription: "bcovrin-test"

diff --git a/deploy/traction/values-development.yaml b/deploy/traction/values-development.yaml
@@ -7,6 +7,25 @@ acapy:
       generated: true
     pluginInnkeeper:
       generated: true
+  ledgers.yml:
+    - id: bcovrin-test
+      is_production: true
+      is_write: true
+      genesis_url: "http://test.bcovrin.vonx.io/genesis"
+      endorser_did: "Ket75eV5UQvVkW2XBjgDH7"
+      endorser_alias: "bcovrin-test-endorser"
+    - id: bcovrin-dev
+      is_production: true
+      is_write: true
+      genesis_url: "http://dev.bcovrin.vonx.io/genesis"
+      endorser_did: "N5bxk3jWkpZ2tEaMtjPjPa"
+      endorser_alias: "bcovrin-dev-endorser"
+    - id: sovrin-testnet
+      is_production: true
+      is_write: true
+      genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis"
+      endorser_did: "EZpKx6nT56Hv83JmNz7ik8"
+      endorser_alias: "sovrin-testnet-endorser"
   plugin-config.yml:
     traction_innkeeper:
       innkeeper_wallet:
@@ -17,9 +36,12 @@ acapy:
             ledger_id: bcovrin-test
           - endorser_alias: bcovrin-dev-endorser
             ledger_id: bcovrin-dev
+          - endorser_alias: sovrin-testnet-endorser
+            ledger_id: sovrin-testnet
         create_public_did:
           - bcovrin-test
           - bcovrin-dev
+          - sovrin-testnet
       reservation:
         expiry_minutes: 7200
   walletStorageConfig:

diff --git a/deploy/traction/values-pr.yaml b/deploy/traction/values-pr.yaml
@@ -12,6 +12,25 @@ acapy:
       tenantid: "innkeeper"
   argfile.yml:
     wallet-name: default
+  ledgers.yml:
+    - id: bcovrin-test
+      is_production: true
+      is_write: true
+      genesis_url: "http://test.bcovrin.vonx.io/genesis"
+      endorser_did: "Ket75eV5UQvVkW2XBjgDH7"
+      endorser_alias: "bcovrin-test-endorser"
+    - id: bcovrin-dev
+      is_production: true
+      is_write: true
+      genesis_url: "http://dev.bcovrin.vonx.io/genesis"
+      endorser_did: "N5bxk3jWkpZ2tEaMtjPjPa"
+      endorser_alias: "bcovrin-dev-endorser"
+    - id: sovrin-testnet
+      is_production: true
+      is_write: true
+      genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis"
+      endorser_did: "EZpKx6nT56Hv83JmNz7ik8"
+      endorser_alias: "sovrin-testnet-endorser"
   plugin-config.yml:
     traction_innkeeper:
       innkeeper_wallet:
@@ -22,12 +41,15 @@ acapy:
             ledger_id: bcovrin-test
           - endorser_alias: bcovrin-dev-endorser
             ledger_id: bcovrin-dev
+          - endorser_alias: sovrin-testnet-endorser
+            ledger_id: sovrin-testnet
         create_public_did:
           - bcovrin-test
           - bcovrin-dev
+          - sovrin-testnet
       reservation:
         expiry_minutes: 2880
-        auto_approve: true
+        auto_approve: false
         auto_issuer: true
   resources:
     limits:

diff --git a/services/tenant-ui/config/custom-environment-variables.json b/services/tenant-ui/config/custom-environment-variables.json
@@ -29,6 +29,11 @@
         "linkTitle": "UX_ABOUT_LINK_TITLE",
         "linkText": "UX_ABOUT_LINK_TEXT",
         "imageUrl": "UX_ABOUT_IMAGE_URL"
+      },
+      "infoBanner": {
+        "message": "UX_INFO_BANNER_MESSAGE",
+        "messageLevel": "UX_INFO_BANNER_MESSAGE_LEVEL",
+        "showMessage": "UX_INFO_BANNER_SHOW_MESSAGE"
       }
     },
     "ariesDetails": {

diff --git a/services/tenant-ui/config/default.json b/services/tenant-ui/config/default.json
@@ -31,6 +31,13 @@
         "linkTitle": "BC Digital Trust Service Agreement",
         "link": "https://github.com/bcgov/bc-vcpedia/blob/main/agents/bc-gov-agent-service.md",
         "imageUrl": "/img/bc/bc_logo.png"
+      },
+      "infoBanner": {
+        "message": "",
+        "messageLevel": "info",
+        "showMessage": false,
+        "environmentName": "",
+        "showEnvironmentName": false
       }
     },
     "ariesDetails": {

diff --git a/services/tenant-ui/frontend/src/assets/layout.scss b/services/tenant-ui/frontend/src/assets/layout.scss
@@ -7,14 +7,16 @@ body {
 }
 
 // The app layout
-.layout-container {
+.alert-container {
   display: flex;
-  flex-direction: row;
-  align-items: flex-start;
+  flex-direction: column;
   min-height: 100vh;
+}
+.layout-container {
+  flex-grow: 1;
+  display: flex;
   width: 100%;
   .layout-sidebar {
-    align-self: stretch;
     background-color: $tenant-ui-primary-color;
     color: $tenant-ui-text-on-primary;
     min-width: 20em;
@@ -27,13 +29,11 @@ body {
 
   .layout-page {
     width: 100%;
-    min-height: 100vh;
     display: flex;
     flex-direction: column;
   }
 
   .layout-header {
-    flex: 0;
     background-color: white;
   }
 

diff --git a/services/tenant-ui/frontend/src/components/Login.vue b/services/tenant-ui/frontend/src/components/Login.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="traction-login grid w-screen h-screen">
+  <!--TODO: This should eventually go somewhere else-->
+  <div class="traction-login grid w-screen flex-grow-1">
     <div class="col-12 md:col-6 xl:col-4">
       <div class="px-8">
         <div class="pt-4 pb-6">

diff --git a/services/tenant-ui/frontend/src/components/connections/Invitations.vue b/services/tenant-ui/frontend/src/components/connections/Invitations.vue
@@ -21,8 +21,7 @@
       <template #header>
         <div class="flex justify-content-between">
           <div class="flex justify-content-start">
-            <CreateConnection :multi="false" class="mr-3" />
-            <CreateConnection :multi="true" />
+            <CreateConnection />
           </div>
           <div class="flex justify-content-end">
             <span class="p-input-icon-left">
@@ -78,6 +77,23 @@
           />
         </template>
       </Column>
+      <Column
+        :sortable="true"
+        field="protocol"
+        :header="$t('common.protocol')"
+        filter-field="protocol"
+        :show-filter-match-modes="false"
+      >
+        <template #filter="{ filterModel, filterCallback }">
+          <InputText
+            v-model="filterModel.value"
+            type="text"
+            class="p-column-filter"
+            placeholder="Search By Protocol"
+            @input="filterCallback()"
+          />
+        </template>
+      </Column>
       <Column
         :sortable="true"
         field="created"
@@ -137,6 +153,7 @@ const formattedInvitations = computed(() =>
     connection_id: inv.connection_id,
     alias: inv.alias,
     invitation_mode: inv.invitation_mode,
+    protocol: inv.connection_protocol,
     created: formatDateLong(inv.created_at as string),
     created_at: inv.created_at,
   }))
@@ -164,6 +181,10 @@ const filter = ref({
     value: null,
     matchMode: FilterMatchMode.CONTAINS,
   },
+  protocol: {
+    value: null,
+    matchMode: FilterMatchMode.CONTAINS,
+  },
   created: {
     value: null,
     matchMode: FilterMatchMode.CONTAINS,

diff --git a/services/tenant-ui/frontend/src/components/connections/createConnection/CreateConnection.vue b/services/tenant-ui/frontend/src/components/connections/createConnection/CreateConnection.vue
@@ -1,37 +1,25 @@
 <template>
   <div>
     <Button
-      :label="
-        props.multi
-          ? $t('connect.multiUseInvitation.multi')
-          : $t('connect.singleUseInvitation.single')
-      "
+      :label="$t('connect.invitation.create')"
       icon="pi pi-user-edit"
       @click="openModal"
     />
     <Dialog
       v-model:visible="displayModal"
-      :header="
-        props.multi
-          ? $t('connect.multiUseInvitation.multiCreate')
-          : $t('connect.singleUseInvitation.singleCreate')
-      "
+      :header="$t('connect.invitation.create')"
       :modal="true"
       :style="{ minWidth: '400px' }"
       @update:visible="handleClose"
     >
-      <CreateConnectionForm
-        :multi="props.multi"
-        @success="$emit('success')"
-        @closed="handleClose"
-      />
+      <CreateConnectionForm @success="$emit('success')" @closed="handleClose" />
     </Dialog>
   </div>
 </template>
 
 <script setup lang="ts">
 // Vue
-import { ref, PropType } from 'vue';
+import { ref } from 'vue';
 // PrimeVue etc
 import Button from 'primevue/button';
 import Dialog from 'primevue/dialog';
@@ -40,14 +28,6 @@ import CreateConnectionForm from './CreateConnectionForm.vue';
 
 defineEmits(['success']);
 
-// Props
-const props = defineProps({
-  multi: {
-    type: Boolean as PropType<boolean>,
-    required: true,
-  },
-});
-
 // Display popup
 const displayModal = ref(false);
 const openModal = async () => {