include required scep column in search,

hide pki certificate email/download when scep is used
inverse-inc · Dec 30, 2021 · fba5173 · fba5173
1 parent 146a871
commit fba5173
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/html/pfappserver/root/src/views/Configuration/pki/certs/_components/TheSearch.vue b/html/pfappserver/root/src/views/Configuration/pki/certs/_components/TheSearch.vue
@@ -77,8 +77,10 @@
               :disabled="!isServiceAlive"
               @click.stop.prevent="goToClone({ id: item.ID, ...item })"
             >{{ $t('Clone') }}</b-button>
-            <button-certificate-download :disabled="!isServiceAlive" :id="item.ID" class="my-1 mr-1" />
-            <button-certificate-email :disabled="!isServiceAlive" :id="item.ID" class="my-1 mr-1" />
+            <button-certificate-download v-if="!item.scep"
+              :disabled="!isServiceAlive" :id="item.ID" class="my-1 mr-1" />
+            <button-certificate-email v-if="!item.scep"
+              :disabled="!isServiceAlive" :id="item.ID" class="my-1 mr-1" />
             <button-certificate-revoke :disabled="!isServiceAlive" :id="item.ID" class="my-1 mr-1" @change="reSearch" />
           </span>
         </template>
@@ -88,6 +90,9 @@
         <template #cell(profile_name)="{ item }">
           <router-link :is="(isServiceAlive) ? 'router-link' : 'span'" :to="{ name: 'pkiProfile', params: { id: item.profile_id } }">{{ item.profile_name }}</router-link>
         </template>
+        <template #cell(scep)="{ item }">
+          <icon name="circle" :class="{ 'text-success': !!item.scep, 'text-danger': !item.scep }" />
+        </template>
       </b-table>
       <b-container fluid v-if="selected.length"
         class="mt-3 p-0">

diff --git a/html/pfappserver/root/src/views/Configuration/pki/certs/_composables/useCollection.js b/html/pfappserver/root/src/views/Configuration/pki/certs/_composables/useCollection.js
@@ -100,6 +100,13 @@ export const useSearch = makeSearch('pkiCerts', {
       sortable: true,
       visible: true
     },
+    {
+      key: 'scep',
+      label: 'SCEP', // i18n defer
+      required: true,
+      sortable: true,
+      visible: true
+    },
     {
       key: 'buttons',
       class: 'text-right p-0',