@rancher/shell 0.2.4 → 0.3.0

package/pages/c/_cluster/settings/links.vue

@@ -27,12 +27,12 @@ export default {
 
   data() {
     return {
-      defaultsDisabled:    true,
-      isRancherPrime:     isRancherPrime(),
-      uiCustomLinks:      {},
-      bannerVal:          {},
-      value:              [],
-      errors:             [],
+      defaultsDisabled: true,
+      isRancherPrime:   isRancherPrime(),
+      uiCustomLinks:    {},
+      bannerVal:        {},
+      value:            [],
+      errors:           [],
     };
   },
   computed: {

package/pages/c/_cluster/uiplugins/DeveloperInstallDialog.vue

@@ -95,7 +95,7 @@ export default {
             name,
             namespace: UI_PLUGIN_NAMESPACE
           },
-          spec:     {
+          spec: {
             plugin: {
               name:     crdName,
               version,

package/pages/c/_cluster/uiplugins/InstallDialog.vue

@@ -146,7 +146,7 @@ export default {
 
       try {
         const app = await this.$store.dispatch('management/find', {
-          type:  CATALOG.APP,
+          type: CATALOG.APP,
           id:   `${ UI_PLUGIN_NAMESPACE }/${ plugin.chart.chartName }`,
           opt:  { force: true },
         });

package/pages/c/_cluster/uiplugins/PluginInfoPanel.vue

@@ -2,8 +2,20 @@
 import ChartReadme from '@shell/components/ChartReadme';
 import { Banner } from '@components/Banner';
 import LazyImage from '@shell/components/LazyImage';
+import { MANAGEMENT } from '@shell/config/types';
+import { SETTING } from '@shell/config/settings';
 
 export default {
+  async fetch() {
+    const bannerSetting = await this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.BANNERS);
+    const { showHeader, bannerHeader } = JSON.parse(bannerSetting.value);
+
+    if (showHeader === 'true') {
+      const headerBannerFontSize = Number(bannerHeader?.fontSize?.split('px')[0] ?? 0);
+
+      this.headerBannerSize = headerBannerFontSize * 2;
+    }
+  },
   components: {
     Banner,
     ChartReadme,
@@ -12,12 +24,13 @@ export default {
 
   data() {
     return {
-      showSlideIn:  false,
-      info:         undefined,
-      infoVersion:  undefined,
-      versionInfo:  undefined,
-      versionError: undefined,
-      defaultIcon:  require('~shell/assets/images/generic-plugin.svg'),
+      showSlideIn:      false,
+      info:             undefined,
+      infoVersion:      undefined,
+      versionInfo:      undefined,
+      versionError:     undefined,
+      defaultIcon:      require('~shell/assets/images/generic-plugin.svg'),
+      headerBannerSize: 0,
     };
   },
 
@@ -80,7 +93,10 @@ export default {
 };
 </script>
 <template>
-  <div class="plugin-info-panel">
+  <div
+    class="plugin-info-panel"
+    :style="`--banner-top-offset: ${headerBannerSize}px`"
+  >
     <div
       v-if="showSlideIn"
       class="glass"
@@ -209,7 +225,8 @@ export default {
     $title-height: 50px;
     $padding: 5px;
     $slideout-width: 35%;
-    $header-height: 54px;
+    --banner-top-offset: 0;
+    $header-height: calc(54px + var(--banner-top-offset));
 
     .glass {
       z-index: 9;

package/pages/c/_cluster/uiplugins/index.vue

@@ -372,13 +372,13 @@ export default {
     this.$store.dispatch('management/forgetType', CATALOG.CLUSTER_REPO);
   },
 
-  methods:    {
+  methods: {
     async updateInstallStatus() {
       let hasService;
 
       try {
         const service = await this.$store.dispatch('management/find', {
-          type:  SERVICE,
+          type: SERVICE,
           id:   `${ UI_PLUGIN_NAMESPACE }/ui-plugin-operator`,
           opt:  { force: true },
         });

package/pages/prefs.vue

@@ -25,17 +25,17 @@ export default {
     return { admin: isAdminUser(this.$store.getters) };
   },
   computed: {
-    keymap:           mapPref(KEYMAP),
-    viewInApi:        mapPref(VIEW_IN_API),
-    allNamespaces:    mapPref(ALL_NAMESPACES),
-    themeShortcut:    mapPref(THEME_SHORTCUT),
-    dateFormat:       mapPref(DATE_FORMAT),
-    timeFormat:       mapPref(TIME_FORMAT),
-    perPage:          mapPref(ROWS_PER_PAGE),
-    hideDesc:         mapPref(HIDE_DESC),
-    showPreRelease:   mapPref(SHOW_PRE_RELEASE),
-    menuMaxClusters:  mapPref(MENU_MAX_CLUSTERS),
-    pluginDeveloper:  mapPref(PLUGIN_DEVELOPER),
+    keymap:          mapPref(KEYMAP),
+    viewInApi:       mapPref(VIEW_IN_API),
+    allNamespaces:   mapPref(ALL_NAMESPACES),
+    themeShortcut:   mapPref(THEME_SHORTCUT),
+    dateFormat:      mapPref(DATE_FORMAT),
+    timeFormat:      mapPref(TIME_FORMAT),
+    perPage:         mapPref(ROWS_PER_PAGE),
+    hideDesc:        mapPref(HIDE_DESC),
+    showPreRelease:  mapPref(SHOW_PRE_RELEASE),
+    menuMaxClusters: mapPref(MENU_MAX_CLUSTERS),
+    pluginDeveloper: mapPref(PLUGIN_DEVELOPER),
 
     ...mapGetters(['isSingleProduct']),
 

package/pages/rio/mesh.vue

@@ -340,10 +340,10 @@ export default {
         const weight = Math.floor(4 * (edge.stats.rps - min) / (max - min)) + 1;
 
         g.setEdge(fromId(edge), toId(edge), {
-          arrowhead:       'smaller',
-          arrowheadClass:  'arrowhead',
-          class:           `weight${ weight }`,
-          curve:           this.d3.curveBasis,
+          arrowhead:      'smaller',
+          arrowheadClass: 'arrowhead',
+          class:          `weight${ weight }`,
+          curve:          this.d3.curveBasis,
           weight,
         });
       }

package/pages/support/index.vue

@@ -51,13 +51,13 @@ export default {
 
   data() {
     return {
-      apps:                 [],
-      vendor:               getVendor(),
-      supportKey:           '',
-      brandSetting:         null,
-      uiIssuesSetting:      null,
-      serverSetting:        null,
-      promos:               [
+      apps:            [],
+      vendor:          getVendor(),
+      supportKey:      '',
+      brandSetting:    null,
+      uiIssuesSetting: null,
+      serverSetting:   null,
+      promos:          [
         'support.promos.one',
         'support.promos.two',
         'support.promos.three',

package/pkg/vue.config.js

@@ -11,6 +11,15 @@ module.exports = function(dir) {
   const SHELL = path.join(dir, '.shell');
   let COMPONENTS_DIR = path.join(SHELL, 'rancher-components');
 
+  const stat = fs.lstatSync(SHELL);
+
+  // If @rancher/shell is a symlink, then use the components folder for it
+  if (stat.isSymbolicLink() && !fs.existsSync(COMPONENTS_DIR)) {
+    const REAL_SHELL = fs.realpathSync(SHELL);
+
+    COMPONENTS_DIR = path.join(REAL_SHELL, '..', 'pkg', 'rancher-components', 'src', 'components');
+  }
+
   if (fs.existsSync(path.join(maindir, 'shell'))) {
     COMPONENTS_DIR = path.join(maindir, 'pkg', 'rancher-components', 'src', 'components');
   }
@@ -76,7 +85,7 @@ module.exports = function(dir) {
 
       // Prevent warning in log with the md files in the content folder
       config.module.rules.push({
-        test:    /\.md$/,
+        test: /\.md$/,
         use:  [
           {
             loader:  'url-loader',

package/plugins/dashboard-store/mutations.js

@@ -10,12 +10,12 @@ function registerType(state, type) {
 
   if ( !cache ) {
     cache = {
-      list:             [],
-      haveAll:          false,
-      haveSelector:     {},
-      revision:         0, // The highest known resourceVersion from the server for this type
-      generation:       0, // Updated every time something is loaded for this type
-      loadCounter:      0, // Used to cancel incremental loads if the page changes during load
+      list:         [],
+      haveAll:      false,
+      haveSelector: {},
+      revision:     0, // The highest known resourceVersion from the server for this type
+      generation:   0, // Updated every time something is loaded for this type
+      loadCounter:  0, // Used to cancel incremental loads if the page changes during load
     };
 
     // Not enumerable so they don't get sent back to the client for SSR

package/plugins/dashboard-store/normalize.js

@@ -3,7 +3,7 @@ import { SCHEMA } from '@shell/config/types';
 import { applyChangeset, changeset, changesetConflicts } from '@shell/utils/object';
 
 export const KEY_FIELD_FOR = {
-  [SCHEMA]:  '_id',
+  [SCHEMA]: '_id',
   default:  'id',
 };