get items rendered in table

bcgov · Dec 12, 2024 · 07c2d90 · 07c2d90
1 parent 3a76f80
commit 07c2d90
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 29 deletions.
diff --git a/client/src/components/administrators.vue b/client/src/components/administrators.vue
@@ -17,8 +17,8 @@
   <combo-table :headers="headers" :schema="schema" model="administrators">
     <template #default="props">
       <tr>
-        <td>{{ props.props.item.columns.email }}</td>
-        <td class="text-right">{{ props.props.item.columns.updated }}</td>
+        <td>{{ props.props.item.email }}</td>
+        <td class="text-right">{{ props.props.item.updated }}</td>
         <td>
           <v-btn
             @click="props.viewItem(props.props)"

diff --git a/client/src/components/bounces.vue b/client/src/components/bounces.vue
@@ -17,12 +17,12 @@
   <combo-table :headers="headers" :schema="schema" model="bounces">
     <template #default="props">
       <tr>
-        <td>{{ props.props.item.columns.userChannelId }}</td>
+        <td>{{ props.props.item.userChannelId }}</td>
         <td class="text-right">
-          {{ props.props.item.columns.hardBounceCount }}
+          {{ props.props.item.hardBounceCount }}
         </td>
-        <td>{{ props.props.item.columns.state }}</td>
-        <td class="text-right">{{ props.props.item.columns.updated }}</td>
+        <td>{{ props.props.item.state }}</td>
+        <td class="text-right">{{ props.props.item.updated }}</td>
         <td>
           <v-btn
             @click="props.viewItem(props.props)"

diff --git a/client/src/components/configurations.vue b/client/src/components/configurations.vue
@@ -17,9 +17,9 @@
   <combo-table :headers="headers" :schema="schema" model="configurations">
     <template #default="props">
       <tr>
-        <td>{{ props.props.item.columns.name }}</td>
-        <td>{{ props.props.item.columns.serviceName }}</td>
-        <td class="text-right">{{ props.props.item.columns.updated }}</td>
+        <td>{{ props.props.item.name }}</td>
+        <td>{{ props.props.item.serviceName }}</td>
+        <td class="text-right">{{ props.props.item.updated }}</td>
         <td>
           <v-btn
             @click="props.viewItem(props.props)"
@@ -32,11 +32,7 @@
           </v-btn>
 
           <template
-            v-if="
-              ['dbSchemaVersion', 'rsa'].indexOf(
-                props.props.item.columns.name,
-              ) < 0
-            "
+            v-if="['dbSchemaVersion', 'rsa'].indexOf(props.props.item.name) < 0"
           >
             <v-btn
               @click="props.editItem(props.props)"
@@ -49,11 +45,7 @@
             </v-btn>
           </template>
           <template
-            v-if="
-              ['dbSchemaVersion', 'rsa'].indexOf(
-                props.props.item.columns.name,
-              ) < 0
-            "
+            v-if="['dbSchemaVersion', 'rsa'].indexOf(props.props.item.name) < 0"
           >
             <v-btn
               @click="props.deleteItem(props.props)"

diff --git a/client/src/components/notifications.vue b/client/src/components/notifications.vue
@@ -23,11 +23,11 @@
   >
     <template #default="props">
       <tr>
-        <td>{{ props.props.item.columns.serviceName }}</td>
-        <td>{{ props.props.item.columns.channel }}</td>
-        <td>{{ props.props.item.columns.state }}</td>
-        <td>{{ props.props.item.columns.isBroadcast }}</td>
-        <td class="text-right">{{ props.props.item.columns.updated }}</td>
+        <td>{{ props.props.item.serviceName }}</td>
+        <td>{{ props.props.item.channel }}</td>
+        <td>{{ props.props.item.state }}</td>
+        <td>{{ props.props.item.isBroadcast }}</td>
+        <td class="text-right">{{ props.props.item.updated }}</td>
         <td>
           <v-btn
             @click="props.viewItem(props.props)"
@@ -38,7 +38,7 @@
             <v-icon>info</v-icon>
             <v-tooltip activator="parent" location="bottom">details</v-tooltip>
           </v-btn>
-          <template v-if="props.props.item.columns.state === 'new'">
+          <template v-if="props.props.item.state === 'new'">
             <v-btn
               @click="props.editItem(props.props)"
               density="compact"

diff --git a/client/src/components/subscriptions.vue b/client/src/components/subscriptions.vue
@@ -17,11 +17,11 @@
   <combo-table :headers="headers" :schema="schema" model="subscriptions">
     <template #default="props">
       <tr>
-        <td>{{ props.props.item.columns.serviceName }}</td>
-        <td>{{ props.props.item.columns.channel }}</td>
-        <td>{{ props.props.item.columns.state }}</td>
+        <td>{{ props.props.item.serviceName }}</td>
+        <td>{{ props.props.item.channel }}</td>
+        <td>{{ props.props.item.state }}</td>
         <td class="text-right">
-          {{ props.props.item.columns.updated }}
+          {{ props.props.item.updated }}
         </td>
         <td>
           <v-btn