add columns

Signed-off-by: Valentijn Scholten <valentijnscholten@gmail.com>

Author: valentijnscholten

src/i18n/locales/en.json

@@ -212,8 +212,10 @@
     "reindex_vulnerable_software": "Vulnerable software",
     "remove_api_key": "Remove API Key",
     "repositories": "Repositories",
-    "repository_advisory_alias_sync_enabled": "Enable Security Advisory alias synchronization",
-    "repository_advisory_mirroring_enabled": "Enable mirroring of Security Advisories (Beta)",
+    "repository_advisory_alias_sync_enabled": "Alias Sync",
+    "repository_advisory_mirroring_enabled": "Advisory Sync",
+    "repository_advisory_alias_sync_toggle": "Enable Security Advisory alias synchronization",
+    "repository_advisory_mirroring_toggle": "Enable mirroring of Security Advisories (Beta)",
     "repository_authentication": "Authentication required",
     "repository_created": "Repository created",
     "repository_deleted": "Repository deleted",

src/shared/utils.js

@@ -128,6 +128,34 @@ export function loadUserPreferencesForBootstrapTable(_this, id, columns) {
   });
 }
 
+/**
+ * Parses advisoryMirroringEnabled from repository.config.
+ * Needed in multiple places, so extracted to a common function.
+ */
+export function parseAdvisoryMirroringEnabled(repo) {
+  if (repo.config) {
+    let value = JSON.parse(repo.config);
+    if (value) {
+      return value.advisoryMirroringEnabled;
+    }
+    return false;
+  }
+}
+
+/**
+ * Parses parseAdvisoryAliasSyncEnabled from repository.config.
+ * Needed in multiple places, so extracted to a common function.
+ */
+export function parseAdvisoryAliasSyncEnabled(repo) {
+  if (repo.config) {
+    let value = JSON.parse(repo.config);
+    if (value) {
+      return value.advisoryAliasSyncEnabled;
+    }
+    return false;
+  }
+}
+
 export function compareVersions(v1, v2) {
   if (!v1) {
     return 1;

src/views/administration/repositories/Repositories.vue

@@ -34,6 +34,8 @@ import bootstrapTableMixin from '../../../mixins/bootstrapTableMixin';
 import common from '../../../shared/common';
 import EventBus from '../../../shared/eventbus';
 import RepositoryCreateRepositoryModal from './RepositoryCreateRepositoryModal';
+import { parseAdvisoryMirroringEnabled } from '@/shared/utils';
+import { parseAdvisoryAliasSyncEnabled } from '@/shared/utils';
 
 export default {
   props: {
@@ -123,6 +125,30 @@ export default {
             return value === true ? '<i class="fa fa-check-square-o" />' : '';
           },
         },
+        {
+          title: this.$t('admin.repository_advisory_mirroring_enabled'),
+          field: 'advisoryMirroringEnabled',
+          class: 'tight',
+          sortable: true,
+          visible: this.type === 'COMPOSER',
+          formatter(value, row, index) {
+            return parseAdvisoryMirroringEnabled(row) === true
+              ? '<i class="fa fa-check-square-o" />'
+              : '';
+          },
+        },
+        {
+          title: this.$t('admin.repository_advisory_alias_sync_enabled'),
+          field: 'advisoryAliasSyncEnabled',
+          class: 'tight',
+          sortable: true,
+          visible: this.type === 'COMPOSER',
+          formatter(value, row, index) {
+            return parseAdvisoryAliasSyncEnabled(row) === true
+              ? '<i class="fa fa-check-square-o" />'
+              : '';
+          },
+        },
       ],
       data: [],
       options: {
@@ -170,10 +196,10 @@ export default {
                       <c-switch color="primary" v-model="internal" label v-bind="labelIcon" />{{$t('admin.internal')}}
                     </div>
                     <div v-if="this.type === 'COMPOSER'">
-                      <c-switch color="primary" v-model="advisoryMirroringEnabled" label v-bind="labelIcon" />{{$t('admin.repository_advisory_mirroring_enabled')}}
+                      <c-switch color="primary" v-model="advisoryMirroringEnabled" label v-bind="labelIcon" />{{$t('admin.repository_advisory_mirroring_toggle')}}
                     </div>
                     <div v-show="advisoryMirroringEnabled" v-if="this.type === 'COMPOSER'">
-                      <c-switch color="primary" v-model="advisoryAliasSyncEnabled" label v-bind="labelIcon" />{{$t('admin.repository_advisory_alias_sync_enabled')}}
+                      <c-switch color="primary" v-model="advisoryAliasSyncEnabled" label v-bind="labelIcon" />{{$t('admin.repository_advisory_alias_sync_toggle')}}
                     </div>
 
                     <div>
@@ -222,22 +248,15 @@ export default {
                 username: row.username,
                 password: row.password || 'HiddenDecryptedPropertyPlaceholder',
                 enabled: row.enabled,
-                advisoryMirroringEnabled:
-                  this.parseAdvisoryMirroringEnabled(row),
-                advisoryAliasSyncEnabled:
-                  this.parseAdvisoryAliasSyncEnabled(row),
+                advisoryMirroringEnabled: parseAdvisoryMirroringEnabled(row),
+                advisoryAliasSyncEnabled: parseAdvisoryAliasSyncEnabled(row),
                 uuid: row.uuid,
                 labelIcon: {
                   dataOn: '\u2713',
                   dataOff: '\u2715',
                 },
               };
             },
-            // TODO remove this dead code
-            // created() {
-            //   this.parseAdvisoryMirroringEnabled(this.repository);
-            //   this.parseAdvisoryAliasSyncEnabled(this.repository);
-            // },
             watch: {
               internal() {
                 this.updateRepository();
@@ -256,24 +275,6 @@ export default {
               },
             },
             methods: {
-              parseAdvisoryMirroringEnabled: function (repo) {
-                if (repo.config) {
-                  let value = JSON.parse(repo.config);
-                  if (value) {
-                    return value.advisoryMirroringEnabled;
-                  }
-                  return null;
-                }
-              },
-              parseAdvisoryAliasSyncEnabled: function (repo) {
-                if (repo.config) {
-                  let value = JSON.parse(repo.config);
-                  if (value) {
-                    return value.advisoryAliasSyncEnabled;
-                  }
-                  return null;
-                }
-              },
               deleteRepository: function () {
                 let url = `${this.$api.BASE_URL}/${this.$api.URL_REPOSITORY}/${this.uuid}`;
                 this.axios