From b968a6c59a15aa1275432e4d99697d524755a5e3 Mon Sep 17 00:00:00 2001 From: gitstart Date: Wed, 11 Oct 2023 09:22:47 +0000 Subject: [PATCH] feat: LENSOSS-35 - Ability to import yaml files Signed-off-by: gitstart --- package-lock.json | 3 ++- .../cluster/workloads/__snapshots__/pods.test.tsx.snap | 1 + .../setup-kubernetes-cluster-catalog-add-menu.injectable.ts | 6 ++++++ .../renderer/components/monaco-editor/monaco-validators.ts | 1 + .../components/workloads-pods/pod-details-list.scss | 3 +++ .../renderer/initializers/add-sync-entries.injectable.tsx | 4 +++- packages/kubectl-versions/build/versions.json | 6 +++++- 7 files changed, 21 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9278ce31fd..ded232148b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34356,6 +34356,7 @@ "@k8slens/resource-templates": "^1.0.0-alpha.1", "@k8slens/routing": "^1.0.0-alpha.5", "@k8slens/run-many": "^1.0.0-alpha.1", + "@k8slens/spinner": "^1.0.0", "@k8slens/startable-stoppable": "^1.0.0-alpha.1", "@k8slens/tooltip": "^1.0.0-alpha.5", "@k8slens/utilities": "^1.0.0-alpha.1", @@ -35782,7 +35783,7 @@ }, "packages/ui-components/spinner": { "name": "@k8slens/spinner", - "version": "1.0.0-alpha.0", + "version": "1.0.0", "license": "MIT", "devDependencies": { "@k8slens/eslint-config": "^6.5.0", diff --git a/packages/core/src/features/cluster/workloads/__snapshots__/pods.test.tsx.snap b/packages/core/src/features/cluster/workloads/__snapshots__/pods.test.tsx.snap index 6119712122..354e29f75f 100644 --- a/packages/core/src/features/cluster/workloads/__snapshots__/pods.test.tsx.snap +++ b/packages/core/src/features/cluster/workloads/__snapshots__/pods.test.tsx.snap @@ -290,6 +290,7 @@ exports[`workloads / pods when navigating to workloads / pods view given a names Pods +
({ @@ -51,9 +52,14 @@ const setupKubernetesClusterCatalogAddMenuListenerInjectable = getInjectable({ message: "Sync file(s)", buttonLabel: "Sync", properties: ["showHiddenFiles", "multiSelections", "openFile"], + filters: [ + { name: 'Kubeconfig and YAML Files', extensions: ['conf', 'yaml', 'yml'] }, + { name: 'All Files', extensions: ['*'] } + ], onPick: addSyncEntries, }), }, + ); } else { ctx.menuItems.push( diff --git a/packages/core/src/renderer/components/monaco-editor/monaco-validators.ts b/packages/core/src/renderer/components/monaco-editor/monaco-validators.ts index f2c1280d21..2e27f90920 100644 --- a/packages/core/src/renderer/components/monaco-editor/monaco-validators.ts +++ b/packages/core/src/renderer/components/monaco-editor/monaco-validators.ts @@ -27,4 +27,5 @@ export function jsonValidator(value: string) { export const monacoValidators = { yaml: yamlValidator, json: jsonValidator, + }; diff --git a/packages/core/src/renderer/components/workloads-pods/pod-details-list.scss b/packages/core/src/renderer/components/workloads-pods/pod-details-list.scss index fe161b023f..cfab06c590 100644 --- a/packages/core/src/renderer/components/workloads-pods/pod-details-list.scss +++ b/packages/core/src/renderer/components/workloads-pods/pod-details-list.scss @@ -37,6 +37,9 @@ &.namespace { flex-grow: 1.2; + //Auto Width: Allow the dropdown to expand horizontally to accommodate the text. + white-space: nowrap; + min-width: min-content; } &.cpu { diff --git a/packages/core/src/renderer/initializers/add-sync-entries.injectable.tsx b/packages/core/src/renderer/initializers/add-sync-entries.injectable.tsx index 025c2bf679..4db85f4eff 100644 --- a/packages/core/src/renderer/initializers/add-sync-entries.injectable.tsx +++ b/packages/core/src/renderer/initializers/add-sync-entries.injectable.tsx @@ -9,7 +9,9 @@ import { runInAction } from "mobx"; import { showSuccessNotificationInjectable } from "@k8slens/notifications"; import userPreferencesStateInjectable from "../../features/user-preferences/common/state.injectable"; -const addSyncEntriesInjectable = getInjectable({ +const + +addSyncEntriesInjectable = getInjectable({ id: "add-sync-entries", instantiate: (di) => { diff --git a/packages/kubectl-versions/build/versions.json b/packages/kubectl-versions/build/versions.json index 9b69c4ed0d..bb46a4c045 100644 --- a/packages/kubectl-versions/build/versions.json +++ b/packages/kubectl-versions/build/versions.json @@ -109,6 +109,10 @@ ], [ "1.27", - "1.27.2" + "1.27.6" + ], + [ + "1.28", + "1.28.2" ] ] \ No newline at end of file