@rancher/shell 0.2.3 → 0.2.4

package/detail/node.vue

@@ -197,22 +197,61 @@ export default {
 
 <template>
   <Loading v-if="$fetchState.pending" />
-  <div v-else class="node">
-    <div class="spacer"></div>
+  <div
+    v-else
+    class="node"
+  >
+    <div class="spacer" />
     <div class="alerts">
-      <Alert class="mr-10" :status="pidPressureStatus" :message="t('node.detail.glance.pidPressure')" />
-      <Alert class="mr-10" :status="diskPressureStatus" :message="t('node.detail.glance.diskPressure')" />
-      <Alert class="mr-10" :status="memoryPressureStatus" :message="t('node.detail.glance.memoryPressure')" />
-      <Alert :status="kubeletStatus" :message="t('node.detail.glance.kubelet')" />
+      <Alert
+        class="mr-10"
+        :status="pidPressureStatus"
+        :message="t('node.detail.glance.pidPressure')"
+      />
+      <Alert
+        class="mr-10"
+        :status="diskPressureStatus"
+        :message="t('node.detail.glance.diskPressure')"
+      />
+      <Alert
+        class="mr-10"
+        :status="memoryPressureStatus"
+        :message="t('node.detail.glance.memoryPressure')"
+      />
+      <Alert
+        :status="kubeletStatus"
+        :message="t('node.detail.glance.kubelet')"
+      />
     </div>
     <div class="mt-20 resources">
-      <ConsumptionGauge :resource-name="t('node.detail.glance.consumptionGauge.cpu')" :capacity="value.cpuCapacity" :used="value.cpuUsage" />
-      <ConsumptionGauge :resource-name="t('node.detail.glance.consumptionGauge.memory')" :capacity="value.ramCapacity" :used="value.ramUsage" :units="memoryUnits" :number-formatter="memoryFormatter" />
-      <ConsumptionGauge :resource-name="t('node.detail.glance.consumptionGauge.pods')" :capacity="value.podCapacity" :used="value.podConsumed" />
+      <ConsumptionGauge
+        :resource-name="t('node.detail.glance.consumptionGauge.cpu')"
+        :capacity="value.cpuCapacity"
+        :used="value.cpuUsage"
+      />
+      <ConsumptionGauge
+        :resource-name="t('node.detail.glance.consumptionGauge.memory')"
+        :capacity="value.ramCapacity"
+        :used="value.ramUsage"
+        :units="memoryUnits"
+        :number-formatter="memoryFormatter"
+      />
+      <ConsumptionGauge
+        :resource-name="t('node.detail.glance.consumptionGauge.pods')"
+        :capacity="value.podCapacity"
+        :used="value.podConsumed"
+      />
     </div>
-    <div class="spacer"></div>
-    <ResourceTabs v-model="value" :mode="mode">
-      <Tab name="pods" :label="t('node.detail.tab.pods')" :weight="4">
+    <div class="spacer" />
+    <ResourceTabs
+      v-model="value"
+      :mode="mode"
+    >
+      <Tab
+        name="pods"
+        :label="t('node.detail.tab.pods')"
+        :weight="4"
+      >
         <SortableTable
           key-field="_key"
           :headers="podTableHeaders"
@@ -222,7 +261,12 @@ export default {
           :search="false"
         />
       </Tab>
-      <Tab v-if="showMetrics" :label="t('node.detail.tab.metrics')" name="node-metrics" :weight="3">
+      <Tab
+        v-if="showMetrics"
+        :label="t('node.detail.tab.metrics')"
+        name="node-metrics"
+        :weight="3"
+      >
         <template #default="props">
           <DashboardMetrics
             v-if="props.active"
@@ -233,7 +277,12 @@ export default {
           />
         </template>
       </Tab>
-      <Tab name="info" :label="t('node.detail.tab.info.label')" class="bordered-table" :weight="2">
+      <Tab
+        name="info"
+        :label="t('node.detail.tab.info.label')"
+        class="bordered-table"
+        :weight="2"
+      >
         <SortableTable
           key-field="_key"
           :headers="infoTableHeaders"
@@ -244,7 +293,11 @@ export default {
           :search="false"
         />
       </Tab>
-      <Tab name="images" :label="t('node.detail.tab.images')" :weight="1">
+      <Tab
+        name="images"
+        :label="t('node.detail.tab.images')"
+        :weight="1"
+      >
         <SortableTable
           key-field="_key"
           :headers="imageTableHeaders"
@@ -253,7 +306,11 @@ export default {
           :table-actions="false"
         />
       </Tab>
-      <Tab name="taints" :label="t('node.detail.tab.taints')" :weight="0">
+      <Tab
+        name="taints"
+        :label="t('node.detail.tab.taints')"
+        :weight="0"
+      >
         <SortableTable
           key-field="_key"
           :headers="taintTableHeaders"
@@ -263,9 +320,17 @@ export default {
           :search="false"
         />
       </Tab>
-      <Tab v-if="v1MonitoringUrl" name="v1Metrics" :label="t('node.detail.tab.metrics')" :weight="0">
+      <Tab
+        v-if="v1MonitoringUrl"
+        name="v1Metrics"
+        :label="t('node.detail.tab.metrics')"
+        :weight="0"
+      >
         <div id="ember-anchor">
-          <EmberPage inline="ember-anchor" :src="v1MonitoringUrl" />
+          <EmberPage
+            inline="ember-anchor"
+            :src="v1MonitoringUrl"
+          />
         </div>
       </Tab>
     </ResourceTabs>

package/detail/pod.vue

@@ -225,8 +225,17 @@ export default {
 
 <template>
   <Loading v-if="$fetchState.pending" />
-  <ResourceTabs v-else mode="view" class="mt-20" :value="value">
-    <Tab :label="t('workload.container.titles.containers')" name="containers" :weight="3">
+  <ResourceTabs
+    v-else
+    mode="view"
+    class="mt-20"
+    :value="value"
+  >
+    <Tab
+      :label="t('workload.container.titles.containers')"
+      name="containers"
+      :weight="3"
+    >
       <SortableTable
         :rows="containers"
         :headers="containerHeaders"
@@ -237,7 +246,12 @@ export default {
         :table-actions="false"
       />
     </Tab>
-    <Tab v-if="v1MonitoringUrl" name="v1Metrics" :label="t('node.detail.tab.metrics')" :weight="0">
+    <Tab
+      v-if="v1MonitoringUrl"
+      name="v1Metrics"
+      :label="t('node.detail.tab.metrics')"
+      :weight="0"
+    >
       <LabeledSelect
         class="pod-metrics-chooser"
         :value="selection"
@@ -246,10 +260,18 @@ export default {
         @input="selectionChanged($event)"
       />
       <div id="ember-anchor">
-        <EmberPage inline="ember-anchor" :src="v1Metrics" />
+        <EmberPage
+          inline="ember-anchor"
+          :src="v1Metrics"
+        />
       </div>
     </Tab>
-    <Tab v-if="showMetrics" :label="t('workload.container.titles.metrics')" name="pod-metrics" :weight="2.5">
+    <Tab
+      v-if="showMetrics"
+      :label="t('workload.container.titles.metrics')"
+      name="pod-metrics"
+      :weight="2.5"
+    >
       <template #default="props">
         <DashboardMetrics
           v-if="props.active"

package/detail/provisioning.cattle.io.cluster.vue

@@ -596,12 +596,32 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <Banner v-if="showWindowsWarning" color="error" :label="t('cluster.banner.os', { newOS: 'Windows', existingOS: 'Linux' })" />
-    <Banner v-if="showEksNodeGroupWarning" color="error" :label="t('cluster.banner.desiredNodeGroupWarning')" />
-
-    <Banner v-if="$fetchState.error" color="error" :label="$fetchState.error" />
-    <ResourceTabs v-model="value" :default-tab="defaultTab">
-      <Tab v-if="showMachines" name="machine-pools" :label-key="value.isCustom ? 'cluster.tabs.machines' : 'cluster.tabs.machinePools'" :weight="4">
+    <Banner
+      v-if="showWindowsWarning"
+      color="error"
+      :label="t('cluster.banner.os', { newOS: 'Windows', existingOS: 'Linux' })"
+    />
+    <Banner
+      v-if="showEksNodeGroupWarning"
+      color="error"
+      :label="t('cluster.banner.desiredNodeGroupWarning')"
+    />
+
+    <Banner
+      v-if="$fetchState.error"
+      color="error"
+      :label="$fetchState.error"
+    />
+    <ResourceTabs
+      v-model="value"
+      :default-tab="defaultTab"
+    >
+      <Tab
+        v-if="showMachines"
+        name="machine-pools"
+        :label-key="value.isCustom ? 'cluster.tabs.machines' : 'cluster.tabs.machinePools'"
+        :weight="4"
+      >
         <ResourceTable
           :rows="machines"
           :schema="machineSchema"
@@ -614,28 +634,60 @@ export default {
         >
           <template #main-row:isFake="{fullColspan}">
             <tr class="main-row">
-              <td :colspan="fullColspan" class="no-entries">
+              <td
+                :colspan="fullColspan"
+                class="no-entries"
+              >
                 {{ t('node.list.noNodes') }}
               </td>
             </tr>
           </template>
 
           <template #group-by="{group}">
-            <div class="pool-row" :class="{'has-description':group.ref && group.ref.template}">
-              <div v-trim-whitespace class="group-tab">
-                <div v-if="group && group.ref" v-html="group.ref.groupByPoolShortLabel" />
-                <div v-else v-html="t('resourceTable.groupLabel.notInANodePool')">
-                </div>
-                <div v-if="group.ref && group.ref.template" class="description text-muted text-small">
+            <div
+              class="pool-row"
+              :class="{'has-description':group.ref && group.ref.template}"
+            >
+              <div
+                v-trim-whitespace
+                class="group-tab"
+              >
+                <div
+                  v-if="group && group.ref"
+                  v-html="group.ref.groupByPoolShortLabel"
+                />
+                <div
+                  v-else
+                  v-html="t('resourceTable.groupLabel.notInANodePool')"
+                />
+                <div
+                  v-if="group.ref && group.ref.template"
+                  class="description text-muted text-small"
+                >
                   {{ group.ref.providerDisplay }} &ndash;  {{ group.ref.providerLocation }} / {{ group.ref.providerSize }} ({{ group.ref.providerName }})
                 </div>
               </div>
-              <div v-if="group.ref" class="right mr-45">
+              <div
+                v-if="group.ref"
+                class="right mr-45"
+              >
                 <template v-if="value.hasLink('update') && group.ref.showScalePool">
-                  <button v-tooltip="t('node.list.scaleDown')" :disabled="!group.ref.canScaleDownPool()" type="button" class="btn btn-sm role-secondary" @click="group.ref.scalePool(-1)">
+                  <button
+                    v-tooltip="t('node.list.scaleDown')"
+                    :disabled="!group.ref.canScaleDownPool()"
+                    type="button"
+                    class="btn btn-sm role-secondary"
+                    @click="group.ref.scalePool(-1)"
+                  >
                     <i class="icon icon-sm icon-minus" />
                   </button>
-                  <button v-tooltip="t('node.list.scaleUp')" :disabled="!group.ref.canScaleUpPool()" type="button" class="btn btn-sm role-secondary ml-10" @click="group.ref.scalePool(1)">
+                  <button
+                    v-tooltip="t('node.list.scaleUp')"
+                    :disabled="!group.ref.canScaleUpPool()"
+                    type="button"
+                    class="btn btn-sm role-secondary ml-10"
+                    @click="group.ref.scalePool(1)"
+                  >
                     <i class="icon icon-sm icon-plus" />
                   </button>
                 </template>
@@ -644,7 +696,12 @@ export default {
           </template>
         </ResourceTable>
       </Tab>
-      <Tab v-else-if="showNodes" name="node-pools" :label-key="value.isCustom ? 'cluster.tabs.machines' : 'cluster.tabs.machinePools'" :weight="4">
+      <Tab
+        v-else-if="showNodes"
+        name="node-pools"
+        :label-key="value.isCustom ? 'cluster.tabs.machines' : 'cluster.tabs.machinePools'"
+        :weight="4"
+      >
         <ResourceTable
           :schema="mgmtNodeSchema"
           :headers="mgmtNodeSchemaHeaders"
@@ -656,35 +713,74 @@ export default {
         >
           <template #main-row:isFake="{fullColspan}">
             <tr class="main-row">
-              <td :colspan="fullColspan" class="no-entries">
+              <td
+                :colspan="fullColspan"
+                class="no-entries"
+              >
                 {{ t('node.list.noNodes') }}
               </td>
             </tr>
           </template>
 
           <template #group-by="{group}">
-            <div class="pool-row" :class="{'has-description':group.ref && group.ref.nodeTemplate}">
-              <div v-trim-whitespace class="group-tab">
-                <div v-if="group.ref" v-html="t('resourceTable.groupLabel.nodePool', { name: group.ref.spec.hostnamePrefix}, true)">
-                </div>
-                <div v-else v-html="t('resourceTable.groupLabel.notInANodePool')">
-                </div>
-                <div v-if="group.ref && group.ref.nodeTemplate" class="description text-muted text-small">
+            <div
+              class="pool-row"
+              :class="{'has-description':group.ref && group.ref.nodeTemplate}"
+            >
+              <div
+                v-trim-whitespace
+                class="group-tab"
+              >
+                <div
+                  v-if="group.ref"
+                  v-html="t('resourceTable.groupLabel.nodePool', { name: group.ref.spec.hostnamePrefix}, true)"
+                />
+                <div
+                  v-else
+                  v-html="t('resourceTable.groupLabel.notInANodePool')"
+                />
+                <div
+                  v-if="group.ref && group.ref.nodeTemplate"
+                  class="description text-muted text-small"
+                >
                   {{ group.ref.providerDisplay }} &ndash;  {{ group.ref.providerLocation }} / {{ group.ref.providerSize }} ({{ group.ref.providerName }})
                 </div>
               </div>
-              <div v-if="group.ref" class="right group-header-buttons">
-                <MachineSummaryGraph :row="poolSummaryInfo[group.ref]" :horizontal="true" class="mr-20" />
+              <div
+                v-if="group.ref"
+                class="right group-header-buttons"
+              >
+                <MachineSummaryGraph
+                  :row="poolSummaryInfo[group.ref]"
+                  :horizontal="true"
+                  class="mr-20"
+                />
                 <template v-if="group.ref.hasLink('update')">
-                  <button v-tooltip="t('node.list.scaleDown')" :disabled="group.ref.spec.quantity < 2" type="button" class="btn btn-sm role-secondary" @click="group.ref.scalePool(-1)">
+                  <button
+                    v-tooltip="t('node.list.scaleDown')"
+                    :disabled="group.ref.spec.quantity < 2"
+                    type="button"
+                    class="btn btn-sm role-secondary"
+                    @click="group.ref.scalePool(-1)"
+                  >
                     <i class="icon icon-sm icon-minus" />
                   </button>
-                  <button v-tooltip="t('node.list.scaleUp')" type="button" class="btn btn-sm role-secondary ml-10" @click="group.ref.scalePool(1)">
+                  <button
+                    v-tooltip="t('node.list.scaleUp')"
+                    type="button"
+                    class="btn btn-sm role-secondary ml-10"
+                    @click="group.ref.scalePool(1)"
+                  >
                     <i class="icon icon-sm icon-plus" />
                   </button>
                 </template>
 
-                <button type="button" class="project-action btn btn-sm role-multi-action actions mr-5 ml-15" :class="{invisible: !showPoolActionButton(group.ref)}" @click="showPoolAction($event, group.ref)">
+                <button
+                  type="button"
+                  class="project-action btn btn-sm role-multi-action actions mr-5 ml-15"
+                  :class="{invisible: !showPoolActionButton(group.ref)}"
+                  @click="showPoolAction($event, group.ref)"
+                >
                   <i class="icon icon-actions" />
                 </button>
               </div>
@@ -693,43 +789,99 @@ export default {
         </ResourceTable>
       </Tab>
 
-      <Tab v-if="showLog" name="log" :label="t('cluster.tabs.log')" :weight="3" class="logs-container">
-        <table class="fixed" cellpadding="0" cellspacing="0">
+      <Tab
+        v-if="showLog"
+        name="log"
+        :label="t('cluster.tabs.log')"
+        :weight="3"
+        class="logs-container"
+      >
+        <table
+          class="fixed"
+          cellpadding="0"
+          cellspacing="0"
+        >
           <tbody class="logs-body">
             <template v-if="logs.length">
-              <tr v-for="line in logs" :key="line.id">
-                <td :key="line.id + '-time'" class="time" v-html="format(line.time)" />
-                <td :key="line.id + '-msg'" class="msg" v-html="line.msg" />
+              <tr
+                v-for="line in logs"
+                :key="line.id"
+              >
+                <td
+                  :key="line.id + '-time'"
+                  class="time"
+                  v-html="format(line.time)"
+                />
+                <td
+                  :key="line.id + '-msg'"
+                  class="msg"
+                  v-html="line.msg"
+                />
               </tr>
             </template>
-            <tr v-else-if="!logOpen" v-t="'cluster.log.connecting'" colspan="2" class="msg text-muted" />
-            <tr v-else v-t="'cluster.log.noData'" colspan="2" class="msg text-muted" />
+            <tr
+              v-else-if="!logOpen"
+              v-t="'cluster.log.connecting'"
+              colspan="2"
+              class="msg text-muted"
+            />
+            <tr
+              v-else
+              v-t="'cluster.log.noData'"
+              colspan="2"
+              class="msg text-muted"
+            />
           </tbody>
         </table>
       </Tab>
 
-      <Tab v-if="showRegistration" name="registration" :label="t('cluster.tabs.registration')" :weight="2">
-        <Banner v-if="!value.isCustom" color="warning" :label="t('cluster.import.warningBanner')" />
-        <CustomCommand v-if="value.isCustom" :cluster-token="clusterToken" :cluster="value" @copied-windows="hasWindowsMachine ? null : showWindowsWarning = true" />
+      <Tab
+        v-if="showRegistration"
+        name="registration"
+        :label="t('cluster.tabs.registration')"
+        :weight="2"
+      >
+        <Banner
+          v-if="!value.isCustom"
+          color="warning"
+          :label="t('cluster.import.warningBanner')"
+        />
+        <CustomCommand
+          v-if="value.isCustom"
+          :cluster-token="clusterToken"
+          :cluster="value"
+          @copied-windows="hasWindowsMachine ? null : showWindowsWarning = true"
+        />
         <template v-else>
           <h4 v-html="t('cluster.import.commandInstructions', null, true)" />
           <CopyCode class="m-10 p-10">
             {{ clusterToken.command }}
           </CopyCode>
 
-          <h4 class="mt-10" v-html="t('cluster.import.commandInstructionsInsecure', null, true)" />
+          <h4
+            class="mt-10"
+            v-html="t('cluster.import.commandInstructionsInsecure', null, true)"
+          />
           <CopyCode class="m-10 p-10">
             {{ clusterToken.insecureCommand }}
           </CopyCode>
 
-          <h4 class="mt-10" v-html="t('cluster.import.clusterRoleBindingInstructions', null, true)" />
+          <h4
+            class="mt-10"
+            v-html="t('cluster.import.clusterRoleBindingInstructions', null, true)"
+          />
           <CopyCode class="m-10 p-10">
             {{ t('cluster.import.clusterRoleBindingCommand', null, true) }}
           </CopyCode>
         </template>
       </Tab>
 
-      <Tab v-if="showSnapshots" name="snapshots" label="Snapshots" :weight="1">
+      <Tab
+        v-if="showSnapshots"
+        name="snapshots"
+        label="Snapshots"
+        :weight="1"
+      >
         <SortableTable
           class="snapshots"
           :headers="value.isRke1 ? rke1SnapshotHeaders : rke2SnapshotHeaders"

package/detail/secret.vue

@@ -157,58 +157,117 @@ export default {
 </script>
 
 <template>
-  <ResourceTabs v-model="value" :mode="mode">
-    <Tab name="data" :label="dataLabel">
+  <ResourceTabs
+    v-model="value"
+    :mode="mode"
+  >
+    <Tab
+      name="data"
+      :label="dataLabel"
+    >
       <template v-if="isRegistry || isBasicAuth">
-        <div v-if="isRegistry" class="row">
+        <div
+          v-if="isRegistry"
+          class="row"
+        >
           <div class="col span-12">
-            <DetailText :value="registryUrl" label-key="secret.registry.domainName">
-            </detailtext>
+            <DetailText
+              :value="registryUrl"
+              label-key="secret.registry.domainName"
+            />
           </div>
         </div>
         <div class="row mt-20">
           <div class="col span-6">
-            <DetailText :value="username" label-key="secret.registry.username" />
+            <DetailText
+              :value="username"
+              label-key="secret.registry.username"
+            />
           </div>
           <div class="col span-6">
-            <DetailText :value="password" label-key="secret.registry.password" :conceal="true" />
+            <DetailText
+              :value="password"
+              label-key="secret.registry.password"
+              :conceal="true"
+            />
           </div>
         </div>
       </template>
 
-      <div v-else-if="isCertificate" class="row">
+      <div
+        v-else-if="isCertificate"
+        class="row"
+      >
         <div class="col span-6">
-          <DetailText :value="key" label-key="secret.certificate.privateKey" :conceal="true" />
+          <DetailText
+            :value="key"
+            label-key="secret.certificate.privateKey"
+            :conceal="true"
+          />
         </div>
         <div class="col span-6">
-          <DetailText :value="crt" label-key="secret.certificate.certificate" />
+          <DetailText
+            :value="crt"
+            label-key="secret.certificate.certificate"
+          />
         </div>
       </div>
 
-      <div v-else-if="isSvcAcctToken" class="row">
+      <div
+        v-else-if="isSvcAcctToken"
+        class="row"
+      >
         <div class="col span-6">
-          <DetailText :value="crt" label-key="secret.serviceAcct.ca" />
+          <DetailText
+            :value="crt"
+            label-key="secret.serviceAcct.ca"
+          />
         </div>
         <div class="col span-6">
-          <DetailText :value="key" label-key="secret.serviceAcct.token" :conceal="true" />
+          <DetailText
+            :value="key"
+            label-key="secret.serviceAcct.token"
+            :conceal="true"
+          />
         </div>
       </div>
 
-      <div v-else-if="isSsh" class="row">
+      <div
+        v-else-if="isSsh"
+        class="row"
+      >
         <div class="col span-6">
-          <DetailText :value="username" label-key="secret.ssh.public" />
+          <DetailText
+            :value="username"
+            label-key="secret.ssh.public"
+          />
         </div>
         <div class="col span-6">
-          <DetailText :value="password" label-key="secret.ssh.private" :conceal="true" />
+          <DetailText
+            :value="password"
+            label-key="secret.ssh.private"
+            :conceal="true"
+          />
         </div>
       </div>
 
       <div v-else>
-        <div v-for="(row,idx) in parsedRows" :key="idx" class="entry">
-          <DetailText :value="row.value" :label="row.key" :conceal="true" />
+        <div
+          v-for="(row,idx) in parsedRows"
+          :key="idx"
+          class="entry"
+        >
+          <DetailText
+            :value="row.value"
+            :label="row.key"
+            :conceal="true"
+          />
         </div>
         <div v-if="!parsedRows.length">
-          <div v-t="'sortableTable.noRows'" class="m-20 text-center" />
+          <div
+            v-t="'sortableTable.noRows'"
+            class="m-20 text-center"
+          />
         </div>
       </div>
     </Tab>