mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
allow to manually input kube-config file path (edit + save on blur + auto-replace "~" => os.homedir()
Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
parent
cb669d15df
commit
bec50de6a6
@ -87,7 +87,7 @@ msgstr "Account Name"
|
||||
msgid "Active"
|
||||
msgstr "Active"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:228
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:248
|
||||
#: src/renderer/components/cluster-manager/clusters-menu.tsx:116
|
||||
msgid "Add Cluster"
|
||||
msgstr "Add Cluster"
|
||||
@ -112,7 +112,7 @@ msgstr "Add bindings to {name}"
|
||||
#~ msgid "Add cluster"
|
||||
#~ msgstr "Add cluster"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:246
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:266
|
||||
msgid "Add cluster(s)"
|
||||
msgstr "Add cluster(s)"
|
||||
|
||||
@ -319,7 +319,7 @@ msgstr "Binding targets"
|
||||
msgid "Bindings"
|
||||
msgstr "Bindings"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:210
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:227
|
||||
msgid "Browse"
|
||||
msgstr "Browse"
|
||||
|
||||
@ -1730,7 +1730,7 @@ msgstr "Parallelism"
|
||||
msgid "Parameters"
|
||||
msgstr "Parameters"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:205
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:222
|
||||
msgid "Paste as text"
|
||||
msgstr "Paste as text"
|
||||
|
||||
@ -1754,7 +1754,7 @@ msgstr "Persistent Volume Claims"
|
||||
msgid "Persistent Volumes"
|
||||
msgstr "Persistent Volumes"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:92
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:106
|
||||
msgid "Please select kube-config's context"
|
||||
msgstr "Please select kube-config's context"
|
||||
|
||||
@ -1851,6 +1851,14 @@ msgstr "Private Key Secret"
|
||||
msgid "Privileged"
|
||||
msgstr "Privileged"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:225
|
||||
#~ msgid "Pro-tip: you can also drag-n-drop kube-config file in the left-side area"
|
||||
#~ msgstr "Pro-tip: you can also drag-n-drop kube-config file in the left-side area"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:229
|
||||
msgid "Pro-tip: you can also drag-n-drop kube-config file to this area"
|
||||
msgstr "Pro-tip: you can also drag-n-drop kube-config file to this area"
|
||||
|
||||
#: src/renderer/components/+storage-classes/storage-class-details.tsx:28
|
||||
#: src/renderer/components/+storage-classes/storage-classes.tsx:35
|
||||
msgid "Provisioner"
|
||||
@ -1860,7 +1868,7 @@ msgstr "Provisioner"
|
||||
msgid "Proxy is used only for non-cluster communication."
|
||||
msgstr "Proxy is used only for non-cluster communication."
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:234
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:254
|
||||
msgid "Proxy settings"
|
||||
msgstr "Proxy settings"
|
||||
|
||||
@ -2041,7 +2049,7 @@ msgstr "Required Drop Capabilities"
|
||||
msgid "Required field"
|
||||
msgstr "Required field"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:209
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:226
|
||||
#: src/renderer/components/item-object-list/page-filters-list.tsx:31
|
||||
msgid "Reset"
|
||||
msgstr "Reset"
|
||||
@ -2050,6 +2058,18 @@ msgstr "Reset"
|
||||
msgid "Reset filters?"
|
||||
msgstr "Reset filters?"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:65
|
||||
msgid "Resetting config to {0}"
|
||||
msgstr "Resetting config to {0}"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:68
|
||||
#~ msgid "Resetting kube-config to current {0}"
|
||||
#~ msgstr "Resetting kube-config to current {0}"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:68
|
||||
#~ msgid "Resetting kube-config to default: {kubeConfigDefaultPath}"
|
||||
#~ msgstr "Resetting kube-config to default: {kubeConfigDefaultPath}"
|
||||
|
||||
#: src/renderer/components/+custom-resources/crd-details.tsx:44
|
||||
#: src/renderer/components/+custom-resources/crd-list.tsx:73
|
||||
msgid "Resource"
|
||||
@ -2245,7 +2265,7 @@ msgstr "Secret type"
|
||||
msgid "Secrets"
|
||||
msgstr "Secrets"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:231
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:251
|
||||
msgid "Select a context"
|
||||
msgstr "Select a context"
|
||||
|
||||
@ -2257,8 +2277,8 @@ msgstr "Select a quota.."
|
||||
#~ msgid "Select context"
|
||||
#~ msgstr "Select context"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:62
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:62
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:76
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:76
|
||||
msgid "Select custom kube-config file"
|
||||
msgstr "Select custom kube-config file"
|
||||
|
||||
@ -2266,13 +2286,17 @@ msgstr "Select custom kube-config file"
|
||||
#~ msgid "Select file"
|
||||
#~ msgstr "Select file"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:221
|
||||
msgid "Select kube-config file"
|
||||
msgstr "Select kube-config file"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:173
|
||||
#~ msgid "Select kubeconfig"
|
||||
#~ msgstr "Select kubeconfig"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:204
|
||||
msgid "Select or drop file"
|
||||
msgstr "Select or drop file"
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:224
|
||||
#~ msgid "Select or drop file"
|
||||
#~ msgstr "Select or drop file"
|
||||
|
||||
#: src/renderer/components/+preferences/preferences.tsx:88
|
||||
#~ msgid "Select repository"
|
||||
@ -2612,8 +2636,8 @@ msgstr "Upgrade version"
|
||||
msgid "Usage"
|
||||
msgstr "Usage"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:63
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:63
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:77
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:77
|
||||
msgid "Use configuration"
|
||||
msgstr "Use configuration"
|
||||
|
||||
|
||||
@ -87,7 +87,7 @@ msgstr ""
|
||||
msgid "Active"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:228
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:248
|
||||
#: src/renderer/components/cluster-manager/clusters-menu.tsx:116
|
||||
msgid "Add Cluster"
|
||||
msgstr ""
|
||||
@ -112,7 +112,7 @@ msgstr ""
|
||||
#~ msgid "Add cluster"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:246
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:266
|
||||
msgid "Add cluster(s)"
|
||||
msgstr ""
|
||||
|
||||
@ -319,7 +319,7 @@ msgstr ""
|
||||
msgid "Bindings"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:210
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:227
|
||||
msgid "Browse"
|
||||
msgstr ""
|
||||
|
||||
@ -1713,7 +1713,7 @@ msgstr ""
|
||||
msgid "Parameters"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:205
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:222
|
||||
msgid "Paste as text"
|
||||
msgstr ""
|
||||
|
||||
@ -1737,7 +1737,7 @@ msgstr ""
|
||||
msgid "Persistent Volumes"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:92
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:106
|
||||
msgid "Please select kube-config's context"
|
||||
msgstr ""
|
||||
|
||||
@ -1834,6 +1834,14 @@ msgstr ""
|
||||
msgid "Privileged"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:225
|
||||
#~ msgid "Pro-tip: you can also drag-n-drop kube-config file in the left-side area"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:229
|
||||
msgid "Pro-tip: you can also drag-n-drop kube-config file to this area"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+storage-classes/storage-class-details.tsx:28
|
||||
#: src/renderer/components/+storage-classes/storage-classes.tsx:35
|
||||
msgid "Provisioner"
|
||||
@ -1843,7 +1851,7 @@ msgstr ""
|
||||
msgid "Proxy is used only for non-cluster communication."
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:234
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:254
|
||||
msgid "Proxy settings"
|
||||
msgstr ""
|
||||
|
||||
@ -2024,7 +2032,7 @@ msgstr ""
|
||||
msgid "Required field"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:209
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:226
|
||||
#: src/renderer/components/item-object-list/page-filters-list.tsx:31
|
||||
msgid "Reset"
|
||||
msgstr ""
|
||||
@ -2033,6 +2041,18 @@ msgstr ""
|
||||
msgid "Reset filters?"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:65
|
||||
msgid "Resetting config to {0}"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:68
|
||||
#~ msgid "Resetting kube-config to current {0}"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:68
|
||||
#~ msgid "Resetting kube-config to default: {kubeConfigDefaultPath}"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+custom-resources/crd-details.tsx:44
|
||||
#: src/renderer/components/+custom-resources/crd-list.tsx:73
|
||||
msgid "Resource"
|
||||
@ -2228,7 +2248,7 @@ msgstr ""
|
||||
msgid "Secrets"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:231
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:251
|
||||
msgid "Select a context"
|
||||
msgstr ""
|
||||
|
||||
@ -2240,8 +2260,8 @@ msgstr ""
|
||||
#~ msgid "Select context"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:62
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:62
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:76
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:76
|
||||
msgid "Select custom kube-config file"
|
||||
msgstr ""
|
||||
|
||||
@ -2249,13 +2269,17 @@ msgstr ""
|
||||
#~ msgid "Select file"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:221
|
||||
msgid "Select kube-config file"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:173
|
||||
#~ msgid "Select kubeconfig"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:204
|
||||
msgid "Select or drop file"
|
||||
msgstr ""
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:224
|
||||
#~ msgid "Select or drop file"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+preferences/preferences.tsx:88
|
||||
#~ msgid "Select repository"
|
||||
@ -2595,8 +2619,8 @@ msgstr ""
|
||||
msgid "Usage"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:63
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:63
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:77
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:77
|
||||
msgid "Use configuration"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ msgstr "Название аккаунта"
|
||||
msgid "Active"
|
||||
msgstr "Активный"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:228
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:248
|
||||
#: src/renderer/components/cluster-manager/clusters-menu.tsx:116
|
||||
msgid "Add Cluster"
|
||||
msgstr ""
|
||||
@ -113,7 +113,7 @@ msgstr "Добавить привязки к {name}"
|
||||
#~ msgid "Add cluster"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:246
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:266
|
||||
msgid "Add cluster(s)"
|
||||
msgstr ""
|
||||
|
||||
@ -320,7 +320,7 @@ msgstr "Цели привязки"
|
||||
msgid "Bindings"
|
||||
msgstr "Привязки"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:210
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:227
|
||||
msgid "Browse"
|
||||
msgstr ""
|
||||
|
||||
@ -1731,7 +1731,7 @@ msgstr "Параллелизм"
|
||||
msgid "Parameters"
|
||||
msgstr "Параметры"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:205
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:222
|
||||
msgid "Paste as text"
|
||||
msgstr ""
|
||||
|
||||
@ -1755,7 +1755,7 @@ msgstr "Persistent Volume Claims"
|
||||
msgid "Persistent Volumes"
|
||||
msgstr "Persistent Volumes"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:92
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:106
|
||||
msgid "Please select kube-config's context"
|
||||
msgstr ""
|
||||
|
||||
@ -1852,6 +1852,14 @@ msgstr "Секрет приватного ключа"
|
||||
msgid "Privileged"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:225
|
||||
#~ msgid "Pro-tip: you can also drag-n-drop kube-config file in the left-side area"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:229
|
||||
msgid "Pro-tip: you can also drag-n-drop kube-config file to this area"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+storage-classes/storage-class-details.tsx:28
|
||||
#: src/renderer/components/+storage-classes/storage-classes.tsx:35
|
||||
msgid "Provisioner"
|
||||
@ -1861,7 +1869,7 @@ msgstr "Комиссия"
|
||||
msgid "Proxy is used only for non-cluster communication."
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:234
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:254
|
||||
msgid "Proxy settings"
|
||||
msgstr ""
|
||||
|
||||
@ -2042,7 +2050,7 @@ msgstr ""
|
||||
msgid "Required field"
|
||||
msgstr "Обязательное поле"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:209
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:226
|
||||
#: src/renderer/components/item-object-list/page-filters-list.tsx:31
|
||||
msgid "Reset"
|
||||
msgstr "Сбросить"
|
||||
@ -2051,6 +2059,18 @@ msgstr "Сбросить"
|
||||
msgid "Reset filters?"
|
||||
msgstr "Сбросить фильтры?"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:65
|
||||
msgid "Resetting config to {0}"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:68
|
||||
#~ msgid "Resetting kube-config to current {0}"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:68
|
||||
#~ msgid "Resetting kube-config to default: {kubeConfigDefaultPath}"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+custom-resources/crd-details.tsx:44
|
||||
#: src/renderer/components/+custom-resources/crd-list.tsx:73
|
||||
msgid "Resource"
|
||||
@ -2246,7 +2266,7 @@ msgstr "Тип секрета"
|
||||
msgid "Secrets"
|
||||
msgstr "Secrets"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:231
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:251
|
||||
msgid "Select a context"
|
||||
msgstr ""
|
||||
|
||||
@ -2258,8 +2278,8 @@ msgstr "Выберите квоту..."
|
||||
#~ msgid "Select context"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:62
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:62
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:76
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:76
|
||||
msgid "Select custom kube-config file"
|
||||
msgstr ""
|
||||
|
||||
@ -2267,13 +2287,17 @@ msgstr ""
|
||||
#~ msgid "Select file"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:221
|
||||
msgid "Select kube-config file"
|
||||
msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:173
|
||||
#~ msgid "Select kubeconfig"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:204
|
||||
msgid "Select or drop file"
|
||||
msgstr ""
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:224
|
||||
#~ msgid "Select or drop file"
|
||||
#~ msgstr ""
|
||||
|
||||
#: src/renderer/components/+preferences/preferences.tsx:88
|
||||
#~ msgid "Select repository"
|
||||
@ -2613,8 +2637,8 @@ msgstr "Обновить версию"
|
||||
msgid "Usage"
|
||||
msgstr "Использование"
|
||||
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:63
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:63
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:77
|
||||
#: src/renderer/components/+add-cluster/add-cluster.tsx:77
|
||||
msgid "Use configuration"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -7,6 +7,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
.hint {
|
||||
margin-top: -$padding;
|
||||
}
|
||||
|
||||
.Select {
|
||||
.kube-context {
|
||||
--flex-gap: #{$padding};
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import "./add-cluster.scss"
|
||||
import os from "os";
|
||||
import React, { Fragment } from "react";
|
||||
import { observer } from "mobx-react";
|
||||
import { computed, observable } from "mobx";
|
||||
@ -23,10 +24,6 @@ import { cssNames } from "../../utils";
|
||||
import { Notifications } from "../notifications";
|
||||
import { Tab, Tabs } from "../tabs";
|
||||
|
||||
// todo: improve UI/UX kube-config consuming: FILE (input + button) | PASTE TEXT (editor)
|
||||
// todo: allow to manually input kube-config file path (edit + save on blur + auto-replace "~" => os.homedir()
|
||||
// todo: allow to create multiple clusters at once (multi-select)
|
||||
|
||||
enum KubeConfigSourceTab {
|
||||
FILE = "file",
|
||||
TEXT = "text"
|
||||
@ -38,6 +35,7 @@ export class AddCluster extends React.Component {
|
||||
@observable.ref newClusterConfig: KubeConfig;
|
||||
@observable.ref error: React.ReactNode;
|
||||
|
||||
@observable kubeConfigPath = "";
|
||||
@observable sourceTab = KubeConfigSourceTab.FILE;
|
||||
@observable isWaiting = false
|
||||
@observable showSettings = false
|
||||
@ -46,28 +44,45 @@ export class AddCluster extends React.Component {
|
||||
@observable customConfig = ""
|
||||
|
||||
componentDidMount() {
|
||||
this.kubeConfigPath = userStore.kubeConfigPath;
|
||||
this.setKubeConfig(userStore.kubeConfigPath);
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
userStore.markNewContextsAsSeen();
|
||||
}
|
||||
|
||||
protected get kubeConfigPath() {
|
||||
return userStore.kubeConfigPath;
|
||||
}
|
||||
|
||||
protected set kubeConfigPath(filePath: string) {
|
||||
protected setKubeConfig(filePath: string, { saveGlobal = true, throwError = false } = {}) {
|
||||
try {
|
||||
const kubeConfig = loadConfig(filePath);
|
||||
validateConfig(kubeConfig);
|
||||
this.kubeConfigPath = filePath;
|
||||
this.localKubeConfig = kubeConfig;
|
||||
this.newClusterConfig = null; // reset previously selected
|
||||
userStore.kubeConfigPath = filePath; // save to store
|
||||
if (saveGlobal) {
|
||||
userStore.kubeConfigPath = filePath; // save to store
|
||||
}
|
||||
} catch (err) {
|
||||
Notifications.error(
|
||||
<p>Can't read config file in <em>{filePath}</em>: {String(err)}</p>
|
||||
);
|
||||
if (throwError) {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onKubeConfigInputBlur = () => {
|
||||
const isChanged = this.kubeConfigPath !== userStore.kubeConfigPath;
|
||||
if (isChanged) {
|
||||
this.kubeConfigPath = this.kubeConfigPath.replace("~", os.homedir());
|
||||
try {
|
||||
this.setKubeConfig(this.kubeConfigPath, { throwError: true })
|
||||
} catch (err) {
|
||||
Notifications.info(<p>
|
||||
<Trans>Resetting config to {userStore.kubeConfigPath}</Trans>
|
||||
</p>, { timeout: 2500 });
|
||||
this.setKubeConfig(userStore.kubeConfigPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,12 +95,12 @@ export class AddCluster extends React.Component {
|
||||
buttonLabel: _i18n._(t`Use configuration`),
|
||||
});
|
||||
if (!canceled && filePaths.length) {
|
||||
this.kubeConfigPath = filePaths[0];
|
||||
this.setKubeConfig(filePaths[0]);
|
||||
}
|
||||
}
|
||||
|
||||
resetKubeConfig = () => {
|
||||
this.kubeConfigPath = kubeConfigDefaultPath;
|
||||
this.setKubeConfig(kubeConfigDefaultPath);
|
||||
}
|
||||
|
||||
@computed get clusterOptions() {
|
||||
@ -119,7 +134,7 @@ export class AddCluster extends React.Component {
|
||||
return label;
|
||||
};
|
||||
|
||||
// fixme: support adding multiple clusters
|
||||
// fixme: allow to create multiple clusters at once (multi-select)
|
||||
addCluster = async () => {
|
||||
const { newClusterConfig, customConfig, proxyServer } = this;
|
||||
const clusterId = uuid();
|
||||
@ -207,7 +222,7 @@ export class AddCluster extends React.Component {
|
||||
<Tabs withBorder onChange={v => this.sourceTab = v}>
|
||||
<Tab
|
||||
value={KubeConfigSourceTab.FILE}
|
||||
label={<Trans>Select or drop file</Trans>}
|
||||
label={<Trans>Select kube-config file</Trans>}
|
||||
active={this.sourceTab == KubeConfigSourceTab.FILE}/>
|
||||
<Tab
|
||||
value={KubeConfigSourceTab.TEXT}
|
||||
@ -216,27 +231,32 @@ export class AddCluster extends React.Component {
|
||||
/>
|
||||
</Tabs>
|
||||
{this.sourceTab === KubeConfigSourceTab.FILE && (
|
||||
<div className="kube-config-select flex gaps align-center">
|
||||
<Input
|
||||
autoSelectOnFocus
|
||||
theme="round-black"
|
||||
className="kube-config-path box grow"
|
||||
value={this.kubeConfigPath}
|
||||
onChange={value => console.log('change', value)}
|
||||
/>
|
||||
{this.kubeConfigPath !== kubeConfigDefaultPath && (
|
||||
<Icon
|
||||
material="settings_backup_restore"
|
||||
onClick={this.resetKubeConfig}
|
||||
tooltip={<Trans>Reset</Trans>}
|
||||
<>
|
||||
<div className="kube-config-select flex gaps align-center">
|
||||
<Input
|
||||
theme="round-black"
|
||||
className="kube-config-path box grow"
|
||||
value={this.kubeConfigPath}
|
||||
onChange={v => this.kubeConfigPath = v}
|
||||
onBlur={this.onKubeConfigInputBlur}
|
||||
/>
|
||||
)}
|
||||
<Icon
|
||||
material="folder"
|
||||
onClick={this.selectKubeConfig}
|
||||
tooltip={<Trans>Browse</Trans>}
|
||||
/>
|
||||
</div>
|
||||
{this.kubeConfigPath !== kubeConfigDefaultPath && (
|
||||
<Icon
|
||||
material="settings_backup_restore"
|
||||
onClick={this.resetKubeConfig}
|
||||
tooltip={<Trans>Reset</Trans>}
|
||||
/>
|
||||
)}
|
||||
<Icon
|
||||
material="folder"
|
||||
onClick={this.selectKubeConfig}
|
||||
tooltip={<Trans>Browse</Trans>}
|
||||
/>
|
||||
</div>
|
||||
<small className="hint">
|
||||
<Trans>Pro-tip: you can also drag-n-drop kube-config file to this area</Trans>
|
||||
</small>
|
||||
</>
|
||||
)}
|
||||
{this.sourceTab === KubeConfigSourceTab.TEXT && (
|
||||
<AceEditor
|
||||
@ -266,7 +286,7 @@ export class AddCluster extends React.Component {
|
||||
},
|
||||
onDrop: event => {
|
||||
this.dropAreaActive = false
|
||||
this.kubeConfigPath = event.dataTransfer.files[0].path;
|
||||
this.setKubeConfig(event.dataTransfer.files[0].path)
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
||||
@ -29,11 +29,12 @@ export class Notifications extends React.Component {
|
||||
});
|
||||
}
|
||||
|
||||
static info(message: IMessage) {
|
||||
static info(message: IMessage, customOpts: Partial<INotification> = {}) {
|
||||
return notificationsStore.add({
|
||||
message: message,
|
||||
status: "info",
|
||||
timeout: 0,
|
||||
status: "info"
|
||||
message: message,
|
||||
...customOpts,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user