Merge pull request #1466 from codyrancher/opa-nav

Updating Gatekeeper navigation
rancher · Sep 28, 2020 · 688dd6d · 688dd6d
2 parents 8fef508 + da67254
commit 688dd6d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/assets/translations/en-us.yaml b/assets/translations/en-us.yaml
@@ -514,6 +514,7 @@ gatekeeperConstraint:
     title: Violations
 
 gatekeeperIndex:
+  poweredBy: OPA Gatekeeper
   unavailable: OPA + Gatekeeper is not available in the system-charts catalog.
   violations: Violations
 
@@ -665,6 +666,7 @@ logging:
       access: Access
       certificate: SSL
   overview:
+    poweredBy: Banzai Cloud
     clusterLevel: Cluster-Level
     namespaceLevel: Namespace-Level
   provider: Provider

diff --git a/config/product/gatekeeper.js b/config/product/gatekeeper.js
@@ -33,21 +33,24 @@ export function init(store) {
     namespaced: false,
     name:       'gatekeeper-overview',
     route:      { name: 'c-cluster-gatekeeper' },
+    weight:     3
   });
 
   virtualType({
     label:      'Constraint',
     namespaced: false,
     name:       'gatekeeper-constraint',
     route:      { name: 'c-cluster-gatekeeper-constraints' },
-    ifHaveType: GATEKEEPER.CONSTRAINT_TEMPLATE
+    ifHaveType: GATEKEEPER.CONSTRAINT_TEMPLATE,
+    weight:     2
   });
 
   virtualType({
     label:      'Template',
     namespaced: false,
     name:       'gatekeeper-template',
     route:      { name: 'c-cluster-gatekeeper-templates' },
-    ifHaveType: GATEKEEPER.CONSTRAINT_TEMPLATE
+    ifHaveType: GATEKEEPER.CONSTRAINT_TEMPLATE,
+    weight:     1
   });
 }
diff --git a/pages/c/_cluster/gatekeeper/index.vue b/pages/c/_cluster/gatekeeper/index.vue
@@ -1,28 +1,25 @@
 <script>
-import InfoBox from '@/components/InfoBox';
 import GatekeeperViolationsTable from '@/components/gatekeeper/ViolationsTable';
 import { NAME, CHART_NAME } from '@/config/product/gatekeeper';
 import InstallRedirect from '@/utils/install-redirect';
+import ChartHeading from '@/components/ChartHeading';
 
 export default {
-  components: {
-    GatekeeperViolationsTable,
-    InfoBox
-  },
+  components: { ChartHeading, GatekeeperViolationsTable },
 
   middleware: InstallRedirect(NAME, CHART_NAME),
 };
 </script>
 
 <template>
   <div>
-    <InfoBox>
-      <div class="mb-15">
-        <h2><t k="gatekeeperIndex.violations" /></h2>
-      </div>
-      <div>
-        <GatekeeperViolationsTable :include-constraint="true" />
-      </div>
-    </InfoBox>
+    <ChartHeading :label="t('gatekeeperIndex.poweredBy')" url="https://github.com/open-policy-agent/gatekeeper" />
+    <div class="spacer" />
+    <div class="mb-15">
+      <h2><t k="gatekeeperIndex.violations" /></h2>
+    </div>
+    <div>
+      <GatekeeperViolationsTable :include-constraint="true" />
+    </div>
   </div>
 </template>
diff --git a/pages/c/_cluster/logging/index.vue b/pages/c/_cluster/logging/index.vue
@@ -72,7 +72,7 @@ export default {
 
 <template>
   <div class="logging">
-    <ChartHeading label="Banzai Cloud" url="https://github.com/banzaicloud/logging-operator" />
+    <ChartHeading :label="t('logging.overview.poweredBy')" url="https://github.com/banzaicloud/logging-operator" />
     <div class="spacer" />
     <h2>{{ t('logging.overview.clusterLevel') }}</h2>
     <SortableTable