Merge pull request #2061 from vincent99/master

Hide fleet rbac
rancher · Dec 11, 2020 · 9940c37 · 9940c37
2 parents d647621 + 9a50a6b
commit 9940c37
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/assets/styles/themes/_dark.scss b/assets/styles/themes/_dark.scss
@@ -162,6 +162,7 @@
 
   --terminal-bg: var(--wm-body-bg);
   --terminal-cursor: var(--warning);
+  --terminal-selection: #{$selected};
   --terminal-text: var(--body-text);
 
   --logs-bg: var(--wm-body-bg);

diff --git a/assets/styles/themes/_light.scss b/assets/styles/themes/_light.scss
@@ -188,6 +188,7 @@ $selected: rgba($primary, .5);
 
   --terminal-bg                : var(--body-bg);
   --terminal-cursor            : var(--warning);
+  --terminal-selection         : #{$selected};
   --terminal-text              : var(--body-text);
 
   --logs-bg                    : var(--wm-body-bg);

diff --git a/components/nav/WindowManager/ContainerShell.vue b/components/nav/WindowManager/ContainerShell.vue
@@ -115,6 +115,7 @@ export default {
         theme: {
           background: docStyle.getPropertyValue('--terminal-bg').trim(),
           cursor:     docStyle.getPropertyValue('--terminal-cursor').trim(),
+          selection:  docStyle.getPropertyValue('--terminal-selection').trim(),
           foreground: docStyle.getPropertyValue('--terminal-text').trim()
         },
         ...this.xtermConfig,

diff --git a/detail/management.cattle.io.fleetworkspace.vue b/detail/management.cattle.io.fleetworkspace.vue
@@ -1,8 +1,8 @@
 <script>
 import CountBox from '@/components/CountBox';
-import RoleBindings from '@/components/RoleBindings';
+// import RoleBindings from '@/components/RoleBindings';
 import ResourceTabs from '@/components/form/ResourceTabs';
-import Tab from '@/components/Tabbed/Tab';
+// import Tab from '@/components/Tabbed/Tab';
 import { SCOPE_NAMESPACE, SCOPE_CLUSTER } from '@/components/RoleBindings.vue';
 import { NAME as FLEET_NAME } from '@/config/product/fleet';
 import { FLEET } from '@/config/types';
@@ -11,7 +11,10 @@ export default {
   name: 'DetailWorkspace',
 
   components: {
-    CountBox, RoleBindings, Tab, ResourceTabs
+    CountBox,
+    // RoleBindings,
+    // Tab,
+    ResourceTabs
   },
 
   props: {
@@ -64,7 +67,7 @@ export default {
     </div>
     <section class="bordered-section">
       <ResourceTabs :value="value" mode="view">
-        <Tab name="members" label="Members">
+        <!-- <Tab name="members" label="Members">
           <RoleBindings
             ref="rb"
             :role-scope="SCOPE_CLUSTER"
@@ -75,7 +78,7 @@ export default {
             mode="view"
             as="detail"
           />
-        </Tab>
+        </Tab> -->
       </ResourceTabs>
     </section>
   </div>

diff --git a/edit/management.cattle.io.fleetworkspace.vue b/edit/management.cattle.io.fleetworkspace.vue
@@ -5,7 +5,7 @@ import Labels from '@/components/form/Labels';
 import Loading from '@/components/Loading';
 import NameNsDescription from '@/components/form/NameNsDescription';
 import { FLEET, MANAGEMENT } from '@/config/types';
-import RoleBindings from '@/components/RoleBindings';
+// import RoleBindings from '@/components/RoleBindings';
 import Tabbed from '@/components/Tabbed';
 import Tab from '@/components/Tabbed/Tab';
 import { SCOPE_NAMESPACE, SCOPE_CLUSTER } from '@/components/RoleBindings.vue';
@@ -19,7 +19,7 @@ export default {
     Labels,
     Loading,
     NameNsDescription,
-    RoleBindings,
+    // RoleBindings,
     Tabbed,
     Tab,
   },
@@ -71,7 +71,7 @@ export default {
     <NameNsDescription v-model="value" :mode="mode" :namespaced="false" />
 
     <Tabbed :side-tabs="true" default-tab="members">
-      <Tab name="members" label-key="generic.members" :weight="2">
+      <!-- <Tab name="members" label-key="generic.members" :weight="2">
         <RoleBindings
           ref="rb"
           :register-after-hook="registerAfterHook"
@@ -82,7 +82,7 @@ export default {
           :mode="mode"
           in-store="management"
         />
-      </Tab>
+      </Tab> -->
 
       <Tab name="labels" label-key="generic.labelsAndAnnotations">
         <Labels v-model="value" :mode="mode" />