@rancher/shell 3.0.7 → 3.0.8-rc.2

package/assets/images/vendor/githubapp.svg

@@ -0,0 +1,13 @@
+<?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:#181616;}
+</style>
+<path class="st0" d="M30,5C15.9,4.9,4.4,16.4,4.3,30.5c0,11.1,7.1,21,17.6,24.4c0.7,0.3,1.4-0.1,1.7-0.7c0.1-0.2,0.1-0.3,0.1-0.5
+	v-4.4c-7.1,1.6-8.6-3.4-8.6-3.4c-1.2-3-2.8-3.7-2.8-3.7c-2.4-1.6,0.2-1.6,0.2-1.6c1.6,0.2,3.1,1.2,3.9,2.6c2.3,3.9,6,2.8,7.4,2.1
+	c0.1-1.3,0.7-2.5,1.6-3.4c-5.7-0.6-11.7-2.8-11.7-12.6c0-2.5,0.9-5,2.6-6.9c-0.8-2.2-0.7-4.6,0.2-6.8c0,0,2.1-0.7,7.1,2.6
+	c4.2-1.1,8.6-1.1,12.8,0c4.9-3.3,7-2.6,7-2.6c0.9,2.1,1,4.6,0.2,6.8c1.7,1.9,2.7,4.3,2.6,6.9c0,9.8-6,12-11.7,12.6
+	c1.2,1.2,1.9,3,1.7,4.7v7c0,0.7,0.5,1.3,1.2,1.3c0.2,0,0.3,0,0.5-0.1c13.4-4.5,20.6-19,16.1-32.4C50.8,12,41,5,30,5z"/>
+</svg>

package/assets/styles/base/_typography.scss

@@ -15,7 +15,7 @@ H1 {
 }
 
 H2 {
-  font-size: 21px;
+  font-size: $font-size-h2;
 }
 
 H3 {

package/assets/styles/global/_layout.scss

@@ -71,6 +71,13 @@ HEADER {
   flex: 1 1 auto;
   min-height: 0px;
 
+  grid-template-areas:
+    "header  header  header  header"
+    "wm-vl    nav     main   wm-vr"
+    "wm-vl    wm       wm    wm-vr";
+  grid-template-rows: var(--header-height) auto var(--wm-height, 0px);
+  grid-template-columns: var(--wm-vl-width, 0px) var(--nav-width) auto var(--wm-vr-width, 0px);
+
   &.dashboard-padding-left {
     padding-left: $app-bar-collapsed-width;
 
@@ -79,31 +86,6 @@ HEADER {
     }
   }
 
-  &.pin-right {
-    grid-template-areas:
-      "header  header  header"
-      "nav      main     wm";
-    grid-template-rows: var(--header-height) auto;
-    grid-template-columns: var(--nav-width) auto var(--wm-width, 0px);
-  }
-
-  &.pin-bottom {
-    grid-template-areas:
-      "header  header"
-      "nav       main"
-      "wm         wm";
-    grid-template-rows: var(--header-height) auto var(--wm-height, 0px);
-    grid-template-columns: var(--nav-width) auto;
-  }
-
-  &.pin-left {
-    grid-template-areas:
-      "header  header  header"
-      "wm       nav     main";
-    grid-template-rows: var(--header-height) auto;
-    grid-template-columns: var(--wm-width, 0px) var(--nav-width) auto;
-  }
-
   >HEADER {
     grid-area: header;
   }
@@ -120,6 +102,20 @@ HEADER {
   position: relative;
 }
 
+.wm-vr {
+  grid-area: wm-vr;
+  overflow-y: hidden;
+  z-index: z-index('windowsManager');
+  position: relative;
+}
+
+.wm-vl {
+  grid-area: wm-vl;
+  overflow-y: hidden;
+  z-index: z-index('windowsManager');
+  position: relative;
+}
+
 .localeSelector {
   :deep(.v-popper__inner) {
     padding: 50px 0;
@@ -153,14 +149,4 @@ HEADER {
   }
 }
 
-.drag-start {
-  z-index: 1000;
-  opacity: 0.5;
-  transition: opacity .3s ease;
-}
-
-.drag-end {
-  opacity: 1;
-}
-
 // !END

package/assets/styles/themes/_modern.scss

@@ -728,8 +728,8 @@ BODY, .theme-light {
   --error-badge    :  #{$error};
   --on-error-banner : #FFFFFF;
 
-  --error-banner-text: #{$error};
-  --warning-banner-text: var(--warning-text);
+  --error-banner-text: #{$grey-100};
+  --warning-banner-text: #{$grey-100};
 }
 
 BODY, .theme-dark {
@@ -1058,7 +1058,7 @@ BODY, .theme-dark {
   --rc-disabled-text-color: #{$gray004};
 
   --error-text    : #FFAC99;
-  --warning-text  : #{$warning};
+  --warning-text  : #{contrast-color($warning)};
 
   --success-badge     : #{rgba($success, 10%)};
   --on-success-banner : #00B752;
@@ -1074,7 +1074,7 @@ BODY, .theme-dark {
 
   --error-banner-bg: #301D1D;
 
-  --warning-banner-text : var(--warning-text);
-  --error-banner-text   : var(--error-text);
+  --warning-banner-text : #{$grey-0};
+  --error-banner-text   : #{$grey-0};
 }
 

package/assets/translations/en-us.yaml

@@ -370,9 +370,7 @@ layouts:
   unauthenticated: unauthenticated layout
   logout: logout layout
   verify: verify layout
-
-windowmanager:
-  closeTab: Close tab {tabId}
+  
 about:
   title: About
   versions:
@@ -472,7 +470,7 @@ addClusterMemberDialog:
 
 addonConfigConfirmation:
   title: Add-On Reset
-  body: Changing the Kubernetes Version can reset Add-On values. You should check that the values are as expected before continuing.
+  body: Add-On Configuration has changed between Kubernetes versions <b>{previousKubeVersion}</b> and <b>{newKubeVersion}</b> and conflict with your previous values for Add-On {addons}. As a result please re-apply them before continuing.
 
 addProjectMemberDialog:
   title: Add Project Member
@@ -492,6 +490,51 @@ authConfig:
   allowedPrincipalIds:
     title: Authorized Users & Groups
   associatedWarning: 'The {provider} account that is used to enable the external provider will be granted admin permissions. If you use a test account or non-admin account, that account will still be granted admin-level permissions. See <a href="{docsBase}/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config#external-authentication-configuration-and-principal-users" target="_blank" rel="noopener noreferrer nofollow">External Authentication Configuration and Principal Users</a> to understand why.'
+  githubapp:
+    clientId:
+      label: Client ID
+    clientSecret:
+      label: Client Secret
+    githubAppId:
+      label: Github App ID
+    installationId:
+      label: Installation ID
+    privateKey:
+      label: Private Key
+    warning: The GitHub App authentication provider only works with <a href="https://docs.github.com/en/get-started/learning-about-github/types-of-github-accounts" target="_blank" rel="noopener noreferrer nofollow">GitHub Organization accounts</a>. It does not support User accounts.
+    form:
+      prefix:
+        1: <li>Open your <a href="{baseUrl}/settings/organizations" target="_blank" rel="noopener noreferrer nofollow">GitHub organization settings</a> in a new window</li>
+        2: <li>To the right of the organization, click "Settings"</li>
+        3: <li>In the left sidebar, click "Developer settings" -> "GitHub Apps"</li>
+        4: <li>Click "New Github App"</li>
+      instruction: 'Fill in the form with these values:'
+      app:
+        label: GitHub App name 
+        value: 'Anything you like, e.g. My {vendor}'
+      callback:
+        label: Callback URL
+        value: '{serverUrl}/verify-auth'
+      description:
+        label: Application description
+        value: 'Optional, can be left blank'
+      homepage:
+        label: Homepage URL
+      create: Click "Create Github App"
+      suffix:
+        1: <li>Under Client Secrets, click "Generate a new client secret"</li>
+        2: <li>Under Private Keys, click "Generate a private key"</li>
+        3: <li>Copy and paste the "App ID", "Client ID", "Client Secret", and "Private Key" of your newly created OAuth app into the fields below</li>
+    host:
+      label: GitHub Enterprise Host
+      placeholder: e.g. github.mycompany.example
+    target:
+      label: Which version of GitHub do you want to use?
+      private: A private installation of GitHub Enterprise
+      public: Public GitHub.com
+    table:
+      server: Server
+      clientId: Client ID
   github:
     clientId:
       label: Client ID
@@ -1796,7 +1839,7 @@ cluster:
         } / {memory, number} GiB Memory / {storageSize, plural,
           =0 {EBS-Only}
           other {{storageSize, number} {storageUnit} {storageType}}
-        }
+        } - {architecture}
     azure:
       acceleratedNetworking:
         label: Accelerated Networking
@@ -2116,7 +2159,7 @@ cluster:
         diskSizeWithMax: Disk size has to be between {diskSizeMin} and {diskSizeMax} based on this image and disk type.
         projects: Image projects should be a comma separated list of alphanumeric string which may contain '-' and '.'
   addOns:
-    dependencyBanner: Add-On Configuration can vary between Kubernetes versions. Changing the Kubernetes version may reset the values below.
+    dependencyBanner: Add-On Configuration has changed between Kubernetes versions <b>{previousKubeVersion}</b> and <b>{newKubeVersion}</b> and conflict with your previous values. Please re-apply them.
     additionalManifest:
       title: Additional Manifest
       tooltip: 'Additional Kubernetes Manifest YAML to be applied to the cluster on startup.'
@@ -2718,6 +2761,28 @@ drainNode:
     placeholder: e.g. 60
     custom: "Give up after:"
 
+dynamicContent:
+  newRelease:
+    title: A new Rancher release is available!
+    message: Rancher {version} has been released!
+    moreInfo: Release Notes
+  multipleNewReleases:
+    title: New Rancher releases are available!
+    message: A new {version1} patch version has been released and a newer {version2} version is also avaialble.
+    moreInfo: "{version} Release Notes"
+  upcomingEom:
+    title: End of Maintainence in {days, plural, =1 {1 day} other {{days} days}}
+    message: This version of Rancher ({version}) will reach End of Maintainence in {days} day(s). Consider upgrading to a supported version soon.
+  eom:
+    title: End of Maintainence reached
+    message: This version of Rancher ({version}) has reached End of Maintainence. Consider upgrading to a supported version.
+  upcomingEol:
+    title: End of Life in {days, plural, =1 {1 day} other {{days} days}}
+    message: This version of Rancher ({version}) will reach End of Life in {days} day(s). Consider upgrading to a supported version soon.
+  eol:
+    title: End of Life reached
+    message: This version of Rancher ({version}) has reached End of Life. Consider upgrading to a supported version.
+
 etcdInfoBanner:
   hasLeader: "Etcd has a leader:"
   leaderChanges: "Number of leader changes:"
@@ -3201,7 +3266,7 @@ fleet:
       none: None
       local: Local
     resources:
-      label: 'Resource Handling'
+      label: 'Resources'
       keepResources: Always keep resources
       keepResourcesTooltip: When enabled, resources will be kept when deleting a HelmOp or Bundle - only Helm release secrets will be deleted.
       correctDrift: Enable self-healing
@@ -3255,6 +3320,10 @@ fleet:
           =0 { Adding namespaces here will create a GitRepoRestriction. }
           other { Only the Git Repo Restriction's <code>allowedTargetNamespaces</code> is managed here. You can make additional changes to the Git Repo Restriction}
         }"
+  configMaps:
+    label: Config Maps
+  secrets:
+    label: Secrets
 footer:
   docs: Docs
   download: Download CLI
@@ -3329,6 +3398,9 @@ glance:
   clusterInfo: Cluster Information
   eventsTable: Full events list
   secretsTable: Full secrets list
+  changeEventsListRowCount: Update events table row count
+  showXEvents: Show {count} events
+  useUserPreference: "Use table preference ({count})"
 
 clusterBadge:
   badgeAppearance: Cluster Badge Appearance
@@ -3776,6 +3848,11 @@ landing:
   homepage: Homepage
   clusters:
     title: Clusters
+    tooMany:
+      showAll: Show all clusters (may increase load time)
+      showSome: Show some clusters (may improve load time)
+      showingAll: Showing {total} clusters.
+      showingSome: Showing {rows} of {total} recently created clusters.
     provider: Provider
     distro: Distro
     kubernetesVersion: Kubernetes Version
@@ -4102,6 +4179,7 @@ login:
   welcome: Welcome to {vendor}
   landscapeAlt: Landscape image
   loggedOut: You have been logged out.
+  loggedOutSessionIdle: You've been logged out of Rancher because your session has expired. Log in again to continue.
   loggedOutFromSso: You've been logged out of Rancher, however you may still be logged in to your single sign-on identity provider.
   loggedOutFromSlo: You've been logged out of Rancher and from your single sign-on identity provider.
   loginAgain: Log in again to continue.
@@ -5114,13 +5192,9 @@ podDisruptionBudget:
 
 inactivity:
   title: Session expiring
-  titleExpired: Session expired
   banner: Your session is about to expire due to inactivity. Any unsaved changes will be lost.
-  bannerExpired: Your session has expired in this tab due to inactivity.
-  content: Click “Resume Session” to keep the session in this tab active or refresh the browser after the session has expired.
-  contentExpired: To return to this page click “Refresh” below or refresh the browser.
+  content: Click “Resume Session” to keep the session in this browser active.
   cta: Resume Session
-  ctaExpired: Refresh
 
 # Rancher Extensions
 plugins:
@@ -5150,6 +5224,8 @@ plugins:
     third-party: This Extension is provided by a Third-Party
     built-in: This Extension is built-in
     image: This Extension Image has been loaded manually
+  tooltips:
+    installing: Installing...
   error:
     title: Error loading extension
     message: Could not load extension code
@@ -7002,7 +7078,15 @@ wizard:
   install: Install
   upgrade: Upgrade
   downgrade: Downgrade
+
+sideWindow:
+  secondary:
+    resize: Resize secondary window
+
 wm:
+  resize: Resize Window - use arrow keys {arrow1} and {arrow2} to resize with keyboard
+  tabIcon: Window tab icon
+  closeTab: Close tab - {tabId}
   connection:
     connected: Connected
     connecting: Connecting&hellip;
@@ -7039,9 +7123,6 @@ wm:
     timestamps: Show Timestamps
     wrap: Wrap Lines
   containerShell:
-    resizeShellWindow: Resize Shell window - use arrow keys {arrow1} and {arrow2} to resize with keyboard
-    tabIcon: Shell tab icon
-    closeShellTab: Close Shell tab - {tab}
     escapeText: Press Shift+Escape to blur from terminal
     clear: Clear
     containerName: "Container: {label}"
@@ -7595,6 +7676,7 @@ model:
       activedirectory: ActiveDirectory
       azuread: AzureAD
       github: GitHub
+      githubapp: GitHub App
       keycloak: Keycloak
       ldap: LDAP
       openldap: OpenLDAP
@@ -8430,8 +8512,9 @@ advancedSettings:
     'auth-user-info-max-age-seconds': 'The maximum age of a users auth tokens before an auth provider group membership sync will be performed.'
     'auth-user-info-resync-cron': 'Default cron schedule for resyncing auth provider group memberships.'
     'cluster-template-enforcement': 'Non-admins will be restricted to launching clusters via preapproved RKE Templates only.'
-    'auth-user-session-ttl-minutes': 'Custom TTL (in minutes) on a user auth session.'
-    'auth-token-max-ttl-minutes': 'Max TTL (in minutes) for all authentication tokens. When set to 0, the token never expires.'
+    'auth-user-session-idle-ttl-minutes': 'Custom idle TTL (in minutes) on a user auth session. This is the maximum duration a session can stay alive when there is no user activity in a browser. This should be smaller than "auth-user-session-ttl-minutes". If "auth-user-session-idle-ttl-minutes" is greater than or equal to "auth-user-session-ttl-minutes" then the session idle feature is considered disabled.'
+    'auth-user-session-ttl-minutes': 'Custom TTL (in minutes) on a user auth session. This is the maximum duration a session can stay alive regardless of user activity in a browser. This should be larger than "auth-user-session-idle-ttl-minutes".'
+    'auth-token-max-ttl-minutes': 'Max TTL (in minutes) for all tokens except those controlled by "auth-user-session-ttl-minutes" (user session tokens). When set to 0, the token never expires.'
     'kubeconfig-generate-token': 'Automatically generate tokens for users when a kubeconfig is requested.'
     'kubeconfig-default-token-ttl-minutes': 'TTL (in minutes) applied on all kubeconfig tokens. When set to 0, the token never expires.'
     'rke-metadata-config': 'Configure RKE metadata refresh parameters.'
@@ -8489,6 +8572,7 @@ featureFlags:
 performance:
   label: UI Performance Settings
   settingName: Performance
+  deprecatedInactivitySetting: The <i class="mr-5">"Inactivity"</i> setting is now deprecated in favor of the <i class="mr-5">auth-user-session-idle-ttl-minutes</i>&nbsp;<a href="{settingsPageUrl}">Setting</a>.
   deprecatedForSSP: The <i class="mr-5">"{setting}"</i> setting is now deprecated and will be removed in a future release.
   incrementalLoad:
     label: Incremental Loading
@@ -9068,3 +9152,4 @@ component:
         weekdaysAt0830: "At 30 minutes past the hour, every 1 hours, starting at 08:00 AM, Monday through Friday"
         marchToMayHourly: "Every hour, only in March, April, and May"
         every4Hours9to17: "At 0 minutes past the hour, every 4 hours, between 09:00 AM and 05:00 PM"
+

package/assets/translations/zh-hans.yaml

@@ -4000,13 +4000,9 @@ podDisruptionBudget:
 
 inactivity:
   title: 会话即将过期
-  titleExpired: 会话已过期
   banner: 由于不活动，你的会话即将过期。任何未保存的更改都将丢失。
-  bannerExpired: 由于不活动，此选项卡中的会话已过期。
   content: 单击“恢复会话”来让选项卡中的会话保持活动状态，或在会话过期后刷新浏览器。
-  contentExpired: 要返回此页面，请单击下面的“刷新”或刷新浏览器。
   cta: 恢复会话
-  ctaExpired: 刷新
 
 # Rancher Extensions
 plugins:

package/components/EmberPage.vue

@@ -8,7 +8,7 @@ import { findEmberPage, clearEmberInactiveTimer, startEmberInactiveTimer, EMBER_
 
 const EMBER_FRAME_HIDE_CLASS = 'ember-iframe-hidden';
 const PAGE_CHECK_TIMEOUT = 30000;
-const WINDOW_MANAGER = 'windowmanager';
+const WINDOW_MANAGER = 'horizontal-window-manager';
 
 // Pages that we should intercept when loaded in the IFRAME and instead
 // navigate to a page in Cluster Dashboard