@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.2

package/utils/object.js

@@ -220,8 +220,14 @@ export function diff(from, to, preventNull = false) {
     if ( Array.isArray(toVal) || Array.isArray(fromVal) ) {
       // Don't diff arrays, just use the whole value
       res[k] = toVal;
-    } else if ( isObject(toVal) && isObject(from[k]) ) {
-      res[k] = diff(fromVal, toVal);
+    } else if ( isObject(toVal) && isObject(fromVal) ) {
+      const nested = diff(fromVal, toVal, preventNull);
+
+      if (isEmpty(toVal) && !isEmpty(fromVal)) {
+        res[k] = {};
+      } else if (!isEmpty(nested)) {
+        res[k] = nested;
+      }
     } else {
       res[k] = toVal;
     }
@@ -235,6 +241,31 @@ export function diff(from, to, preventNull = false) {
 
   for ( const k of missing ) {
     // we need to gate this in order to prevent unforseen problems with addonConfig
+    const hasDescendant = toKeys.some(
+      (tk) => tk.startsWith(`${ k }.`)
+    );
+
+    if (hasDescendant) {
+      continue;
+    }
+
+    // If we already have a value in 'out' for any parent of this missing key, do NOT nullify the child.
+    const parts = splitObjectPath(k);
+    let hasUpdatedParent = false;
+
+    for (let i = 1; i < parts.length; i++) {
+      const parentPath = joinObjectPath(parts.slice(0, i));
+
+      if (get(out, parentPath) !== undefined) {
+        hasUpdatedParent = true;
+        break;
+      }
+    }
+
+    if (hasUpdatedParent) {
+      continue;
+    }
+
     if (preventNull) {
     // keys that come from "definedKeys" method are strings with "" chars inside... We need to clean them up
       // so that we can access the value of the obj property

package/utils/time.ts

@@ -2,6 +2,11 @@ import day from 'dayjs';
 import { escapeHtml } from '@shell/utils/string';
 import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 import { type Store } from 'vuex';
+import { ZERO_TIME } from '@shell/config/types';
+
+export function isMissingDate(date: string | undefined | null): boolean {
+  return !date || date === ZERO_TIME;
+}
 
 const FACTORS = [60, 60, 24];
 const LABELS = ['sec', 'min', 'hour', 'day'];

package/vue.config.js

@@ -75,15 +75,6 @@ const getProxyConfig = (proxyConfig) => ({
   '/v1-*':           proxyOpts(api), // SAML, KDM, etc
   '/rancherversion': proxyPrimeOpts(api), // Rancher version endpoint
   '/version':        proxyPrimeOpts(api), // Rancher Kube version endpoint
-  // These are for Ember embedding
-  '/c/*/edit':       proxyOpts('https://127.0.0.1:8000'), // Can't proxy all of /c because that's used by Vue too
-  '/k/':             proxyOpts('https://127.0.0.1:8000'),
-  '/g/':             proxyOpts('https://127.0.0.1:8000'),
-  '/n/':             proxyOpts('https://127.0.0.1:8000'),
-  '/p/':             proxyOpts('https://127.0.0.1:8000'),
-  '/assets':         proxyOpts('https://127.0.0.1:8000'),
-  '/translations':   proxyOpts('https://127.0.0.1:8000'),
-  '/engines-dist':   proxyOpts('https://127.0.0.1:8000'),
 });
 
 /**

package/assets/images/providers/azuread-black.svg

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path d="M54.5,37.8000031C53.9000015,38,53.5,38.2000046,52.9000015,38.2000046v30.5999985
-		c0.4000015,0,0.8000031,0.1999969,1.1999969,0.4000015l15.5999985-10
-		c-0.4000015-0.8000031-0.4000015-1.8000031-0.4000015-2.8000031c0-1.4000015,0.4000015-3,1.1999969-4.1999969L54.5,37.8000031z"/>
-	<path d="M50.0999947,0L0.2999973,58.8000031L50.0999947,100l49.6000099-41.1999969L50.0999947,0z M76.9000015,64.5999985
-		c-1.8000031,0-3.5999985-0.5999985-5-1.8000031L57.2999954,72c1,1.4000015,1.4000015,3,1.5999985,4.5999985
-		C59.4999924,81,56.6999969,85,52.2999954,85.8000031c-4.4000015,0.6000061-8.4000015-2.1999969-9.1999969-6.6000061
-		c-0.1999969-0.8000031-0.1999969-1.5999985,0-2.5999985C43.0999985,75,43.5,73.4000015,44.5,72.1999969l-15.4000034-10
-		c-3,3-8,3-11,0c-1.4000015-1.4000015-2.4000015-3.5999985-2.4000015-5.5999985c0-4.4000015,3.5999985-8,8-8
-		C25.2999935,48.5999985,26.899992,49,28.0999966,50l16.0000019-14.8000031c-1.1999969-1.5999985-2-3.5999985-2-5.5999985
-		c0-5,4-8.8000031,9-8.8000031s8.8000031,4,8.8000031,8.8000031c0,2-0.8000031,4-2,5.5999985l15.4000015,14.4000015
-		c4-2,8.7999954-0.5999985,10.7999954,3.4000015s0.6000061,8.8000031-3.3999939,10.8000031
-		C79.2999954,64.1999969,78.0999985,64.5999985,76.9000015,64.5999985z"/>
-	<path d="M30.4999981,53.1999969C31.3000011,55,31.4999981,57,30.8999996,58.7999954l16.4000034,10.5999985
-		c0.4000015-0.1999969,0.8000031-0.4000015,1.4000015-0.4000015V38.4000015c-0.5999985,0-1.1999969-0.1999969-1.5999985-0.5999985
-		L30.4999981,53.1999969z"/>
-</g>
-</svg>

package/assets/images/providers/azuread.svg

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00AAF2;}
-</style>
-<g>
-	<path class="st0" d="M54.5,37.8000031C53.9000015,38,53.5,38.2000046,52.9000015,38.2000046v30.5999985
-		c0.4000015,0,0.8000031,0.1999969,1.1999969,0.4000015l15.5999985-10
-		c-0.4000015-0.8000031-0.4000015-1.8000031-0.4000015-2.8000031c0-1.4000015,0.4000015-3,1.1999969-4.1999969L54.5,37.8000031z"/>
-	<path class="st0" d="M50.0999947,0L0.2999973,58.8000031L50.0999947,100l49.6000099-41.1999969L50.0999947,0z
-		 M76.9000015,64.5999985c-1.8000031,0-3.5999985-0.5999985-5-1.8000031L57.2999954,72c1,1.4000015,1.4000015,3,1.5999985,4.5999985
-		C59.4999924,81,56.6999969,85,52.2999954,85.8000031c-4.4000015,0.6000061-8.4000015-2.1999969-9.1999969-6.6000061
-		c-0.1999969-0.8000031-0.1999969-1.5999985,0-2.5999985C43.0999985,75,43.5,73.4000015,44.5,72.1999969l-15.4000034-10
-		c-3,3-8,3-11,0c-1.4000015-1.4000015-2.4000015-3.5999985-2.4000015-5.5999985c0-4.4000015,3.5999985-8,8-8
-		C25.2999935,48.5999985,26.899992,49,28.0999966,50l16.0000019-14.8000031c-1.1999969-1.5999985-2-3.5999985-2-5.5999985
-		c0-5,4-8.8000031,9-8.8000031s8.8000031,4,8.8000031,8.8000031c0,2-0.8000031,4-2,5.5999985l15.4000015,14.4000015
-		c4-2,8.7999954-0.5999985,10.7999954,3.4000015s0.6000061,8.8000031-3.3999939,10.8000031
-		C79.2999954,64.1999969,78.0999985,64.5999985,76.9000015,64.5999985z"/>
-	<path class="st0" d="M30.4999981,53.1999969C31.3000011,55,31.4999981,57,30.8999996,58.7999954l16.4000034,10.5999985
-		c0.4000015-0.1999969,0.8000031-0.4000015,1.4000015-0.4000015V38.4000015c-0.5999985,0-1.1999969-0.1999969-1.5999985-0.5999985
-		L30.4999981,53.1999969z"/>
-</g>
-</svg>

package/assets/images/vendor/azuread.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00AAF2;}
-</style>
-<g>
-	<path class="st0" d="M32.2,23.9c-0.3,0.1-0.5,0.2-0.8,0.2v15.3c0.2,0,0.4,0.1,0.6,0.2l7.8-5c-0.2-0.4-0.2-0.9-0.2-1.4
-		c0-0.7,0.2-1.5,0.6-2.1L32.2,23.9z"/>
-	<path class="st0" d="M30,5L5.1,34.4L30,55l24.8-20.6L30,5z M43.4,37.3c-0.9,0-1.8-0.3-2.5-0.9L33.6,41c0.5,0.7,0.7,1.5,0.8,2.3
-		c0.3,2.2-1.1,4.2-3.3,4.6c-2.2,0.3-4.2-1.1-4.6-3.3c-0.1-0.4-0.1-0.8,0-1.3c0-0.8,0.2-1.6,0.7-2.2l-7.7-5c-1.5,1.5-4,1.5-5.5,0
-		c-0.7-0.7-1.2-1.8-1.2-2.8c0-2.2,1.8-4,4-4c0.8,0,1.6,0.2,2.2,0.7l8-7.4c-0.6-0.8-1-1.8-1-2.8c0-2.5,2-4.4,4.5-4.4s4.4,2,4.4,4.4
-		c0,1-0.4,2-1,2.8l7.7,7.2c2-1,4.4-0.3,5.4,1.7s0.3,4.4-1.7,5.4C44.6,37.1,44,37.3,43.4,37.3z"/>
-	<path class="st0" d="M20.2,31.6c0.4,0.9,0.5,1.9,0.2,2.8l8.2,5.3c0.2-0.1,0.4-0.2,0.7-0.2V24.2c-0.3,0-0.6-0.1-0.8-0.3L20.2,31.6z"
-		/>
-</g>
-</svg>

package/assets/styles/fonts/_dots.scss

@@ -1,18 +0,0 @@
-@font-face {
-  font-family: 'dotsfont';
-  font-weight: normal;
-  font-style: normal;
-  src: url(data:application/font-woff;charset=utf-8;base64,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) format('woff');
-}
-
-.conceal:not(:invalid):not(:focus) {
-  font-family: 'dotsfont' !important;
-  font-size: 6px;
-  }
-
-.conceal PRE {
-  font-family: 'dotsfont' !important;
-  font-size: 10px;
-}
-
-