diff --git a/integration/specs/app_spec.ts b/integration/__tests__/app.tests.ts similarity index 100% rename from integration/specs/app_spec.ts rename to integration/__tests__/app.tests.ts diff --git a/integration/helpers/utils.ts b/integration/helpers/utils.ts index 72d6e3d732..a50b13e023 100644 --- a/integration/helpers/utils.ts +++ b/integration/helpers/utils.ts @@ -1,23 +1,16 @@ import { Application } from "spectron"; -let appPath = "" -switch(process.platform) { -case "win32": - appPath = "./dist/win-unpacked/Lens.exe" - break -case "linux": - appPath = "./dist/linux-unpacked/kontena-lens" - break -case "darwin": - appPath = "./dist/mac/Lens.app/Contents/MacOS/Lens" - break +const AppPaths: Partial> = { + "win32": "./dist/win-unpacked/Lens.exe", + "linux": "./dist/linux-unpacked/kontena-lens", + "darwin": "./dist/mac/Lens.app/Contents/MacOS/Lens", } export function setup(): Application { return new Application({ // path to electron app args: [], - path: appPath, + path: AppPaths[process.platform], startTimeout: 30000, waitTimeout: 30000, chromeDriverArgs: ['remote-debugging-port=9222'], @@ -32,7 +25,7 @@ export async function tearDown(app: Application) { await app.stop() try { process.kill(pid, 0); - } catch(e) { + } catch (e) { return } } diff --git a/locales/en/messages.po b/locales/en/messages.po index 092161d0cf..86f99a841f 100644 --- a/locales/en/messages.po +++ b/locales/en/messages.po @@ -49,7 +49,7 @@ msgstr "<0>Filtered: {itemsCount} / {allItemsCount}" #~ msgid "<0>Your browser does not support all Lens features. Please consider using another browser." #~ msgstr "<0>Your browser does not support all Lens features. Please consider using another browser." -#: src/renderer/components/dock/create-resource.tsx:56 +#: src/renderer/components/dock/create-resource.tsx:58 msgid "<0>{0} successfully created" msgstr "<0>{0} successfully created" @@ -57,7 +57,7 @@ msgstr "<0>{0} successfully created" #~ msgid "A HTTP proxy server URL (format: http://
:)" #~ msgstr "A HTTP proxy server URL (format: http://
:)" -#: src/renderer/components/input/input.validators.ts:46 +#: src/renderer/components/input/input_validators.ts:46 msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." msgstr "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." @@ -87,7 +87,7 @@ msgstr "Account Name" msgid "Active" msgstr "Active" -#: src/renderer/components/+add-cluster/add-cluster.tsx:288 +#: src/renderer/components/+add-cluster/add-cluster.tsx:289 #: src/renderer/components/cluster-manager/clusters-menu.tsx:130 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:305 +#: src/renderer/components/+add-cluster/add-cluster.tsx:306 msgid "Add cluster(s)" msgstr "Add cluster(s)" @@ -273,7 +273,7 @@ msgstr "App Version" msgid "App crash at <0>{pageUrl}" msgstr "App crash at <0>{pageUrl}" -#: src/renderer/components/dock/edit-resource.tsx:88 +#: src/renderer/components/dock/edit-resource.tsx:87 msgid "Applying.." msgstr "Applying.." @@ -404,7 +404,7 @@ msgstr "CPU:" #: src/renderer/components/+workspaces/workspaces.tsx:133 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44 -#: src/renderer/components/dock/info-panel.tsx:97 +#: src/renderer/components/dock/info-panel.tsx:85 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Cancel" msgstr "Cancel" @@ -440,7 +440,7 @@ msgstr "Chart" msgid "Chart Release <0>{0} successfully created." msgstr "Chart Release <0>{0} successfully created." -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:105 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:124 msgid "Chart: {0}" msgstr "Chart: {0}" @@ -647,7 +647,7 @@ msgstr "Count" #: src/renderer/components/+user-management-roles/add-role-dialog.tsx:73 #: src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx:212 #: src/renderer/components/+user-management-service-accounts/create-service-account-dialog.tsx:76 -#: src/renderer/components/dock/create-resource.tsx:71 +#: src/renderer/components/dock/create-resource.tsx:74 msgid "Create" msgstr "Create" @@ -691,7 +691,7 @@ msgstr "Create new Secret" msgid "Create new Service Account" msgstr "Create new Service Account" -#: src/renderer/components/dock/dock.tsx:111 +#: src/renderer/components/dock/dock.tsx:93 msgid "Create resource" msgstr "Create resource" @@ -783,8 +783,8 @@ msgid "Default Runtime Class Name" msgstr "Default Runtime Class Name" #: src/renderer/components/+preferences/kubectl-binaries.tsx:30 -msgid "Default:" -msgstr "Default:" +#~ msgid "Default:" +#~ msgstr "Default:" #: src/renderer/components/+custom-resources/custom-resources.tsx:22 msgid "Definitions" @@ -848,15 +848,19 @@ msgstr "Domains" msgid "Download file" msgstr "Download file" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:39 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:24 msgid "Download kubectl binaries" msgstr "Download kubectl binaries" #: src/renderer/components/+preferences/kubectl-binaries.tsx:37 -msgid "Download kubectl binaries matching to Kubernetes cluster verison." -msgstr "Download kubectl binaries matching to Kubernetes cluster verison." +#~ msgid "Download kubectl binaries matching to Kubernetes cluster verison." +#~ msgstr "Download kubectl binaries matching to Kubernetes cluster verison." -#: src/renderer/components/+preferences/kubectl-binaries.tsx:41 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:26 +msgid "Download kubectl binaries matching to Kubernetes cluster version." +msgstr "Download kubectl binaries matching to Kubernetes cluster version." + +#: src/renderer/components/+preferences/kubectl-binaries.tsx:29 msgid "Download mirror for kubectl" msgstr "Download mirror for kubectl" @@ -944,7 +948,7 @@ msgstr "Everything is fine in the Cluster" #~ msgid "Excluded items with \"system:\" prefix" #~ msgstr "Excluded items with \"system:\" prefix" -#: src/renderer/components/dock/dock.tsx:116 +#: src/renderer/components/dock/dock.tsx:98 msgid "Exit full size mode" msgstr "Exit full size mode" @@ -985,7 +989,7 @@ msgstr "Finalizers" msgid "First seen" msgstr "First seen" -#: src/renderer/components/dock/dock.tsx:116 +#: src/renderer/components/dock/dock.tsx:98 msgid "Fit to window" msgstr "Fit to window" @@ -1073,7 +1077,7 @@ msgstr "Hide" msgid "High number of replicas may cause cluster performance issues" msgstr "High number of replicas may cause cluster performance issues" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:81 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:88 msgid "Home" msgstr "Home" @@ -1128,7 +1132,7 @@ msgstr "Image" msgid "ImagePullPolicy" msgstr "ImagePullPolicy" -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:80 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:108 msgid "ImagePullSecrets" msgstr "ImagePullSecrets" @@ -1153,8 +1157,8 @@ msgstr "Ingresses" msgid "Init Containers" msgstr "Init Containers" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:76 -#: src/renderer/components/dock/install-chart.tsx:128 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:83 +#: src/renderer/components/dock/install-chart.tsx:127 msgid "Install" msgstr "Install" @@ -1162,15 +1166,15 @@ msgstr "Install" msgid "Installation complete!" msgstr "Installation complete!" -#: src/renderer/components/dock/install-chart.tsx:128 +#: src/renderer/components/dock/install-chart.tsx:127 msgid "Installing..." msgstr "Installing..." -#: src/renderer/components/input/input.validators.ts:50 +#: src/renderer/components/input/input_validators.ts:50 msgid "Invalid account ID" msgstr "Invalid account ID" -#: src/renderer/components/input/input.validators.ts:16 +#: src/renderer/components/input/input_validators.ts:16 msgid "Invalid number" msgstr "Invalid number" @@ -1231,13 +1235,13 @@ msgstr "Key Size" msgid "Keys" msgstr "Keys" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:87 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:94 msgid "Keywords" msgstr "Keywords" #: src/renderer/components/+events/event-details.tsx:57 #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:79 -#: src/renderer/components/dock/edit-resource.tsx:89 +#: src/renderer/components/dock/edit-resource.tsx:88 msgid "Kind" msgstr "Kind" @@ -1249,7 +1253,7 @@ msgstr "Kubeconfig" msgid "Kubeconfig File" msgstr "Kubeconfig File" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:35 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:23 msgid "Kubectl Binary" msgstr "Kubectl Binary" @@ -1343,7 +1347,7 @@ msgstr "Logs" msgid "Logs copied to clipboard." msgstr "Logs copied to clipboard." -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:84 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:91 msgid "Maintainers" msgstr "Maintainers" @@ -1369,7 +1373,7 @@ msgstr "Max Pods" msgid "Max Unavailable" msgstr "Max Unavailable" -#: src/renderer/components/input/input.validators.ts:41 +#: src/renderer/components/input/input_validators.ts:41 msgid "Maximum length is {maxLength}" msgstr "Maximum length is {maxLength}" @@ -1441,11 +1445,11 @@ msgstr "Min Available" msgid "Min Pods" msgstr "Min Pods" -#: src/renderer/components/dock/dock.tsx:117 +#: src/renderer/components/dock/dock.tsx:99 msgid "Minimize" msgstr "Minimize" -#: src/renderer/components/input/input.validators.ts:36 +#: src/renderer/components/input/input_validators.ts:36 msgid "Minimum length is {minLength}" msgstr "Minimum length is {minLength}" @@ -1454,7 +1458,7 @@ msgstr "Minimum length is {minLength}" msgid "Mount Options" msgstr "Mount Options" -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:84 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:112 msgid "Mountable secrets" msgstr "Mountable secrets" @@ -1510,7 +1514,7 @@ msgstr "Mounts" #: src/renderer/components/+workloads-replicasets/replicasets.tsx:50 #: src/renderer/components/+workloads-statefulsets/statefulsets.tsx:40 #: src/renderer/components/+workspaces/workspaces.tsx:130 -#: src/renderer/components/dock/edit-resource.tsx:90 +#: src/renderer/components/dock/edit-resource.tsx:89 #: src/renderer/components/kube-object/kube-object-meta.tsx:20 msgid "Name" msgstr "Name" @@ -1556,7 +1560,7 @@ msgstr "Names" #: src/renderer/components/+workloads-jobs/jobs.tsx:38 #: src/renderer/components/+workloads-pods/pods.tsx:76 #: src/renderer/components/+workloads-statefulsets/statefulsets.tsx:41 -#: src/renderer/components/dock/edit-resource.tsx:91 +#: src/renderer/components/dock/edit-resource.tsx:90 #: src/renderer/components/dock/install-chart.tsx:122 #: src/renderer/components/dock/upgrade-chart.tsx:98 #: src/renderer/components/item-object-list/page-filters-select.tsx:57 @@ -1600,7 +1604,7 @@ msgstr "Network Policies" msgid "New logs since opening the dialog" msgstr "New logs since opening the dialog" -#: src/renderer/components/dock/dock.tsx:104 +#: src/renderer/components/dock/dock.tsx:86 msgid "New tab" msgstr "New tab" @@ -1734,7 +1738,7 @@ msgstr "Ok" msgid "Ok, got it!" msgstr "Ok, got it!" -#: src/renderer/components/dock/dock.tsx:117 +#: src/renderer/components/dock/dock.tsx:99 msgid "Open" msgstr "Open" @@ -1939,7 +1943,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:293 +#: src/renderer/components/+add-cluster/add-cluster.tsx:294 msgid "Proxy settings" msgstr "Proxy settings" @@ -2264,7 +2268,7 @@ msgstr "Runtime Class" #: src/renderer/components/+config-secrets/secret-details.tsx:97 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 #: src/renderer/components/+workspaces/workspaces.tsx:132 -#: src/renderer/components/dock/edit-resource.tsx:88 +#: src/renderer/components/dock/edit-resource.tsx:87 msgid "Save" msgstr "Save" @@ -2318,6 +2322,10 @@ msgstr "Secret" msgid "Secret Name" msgstr "Secret Name" +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:72 +msgid "Secret is not found" +msgstr "Secret is not found" + #: src/renderer/components/+config-secrets/add-secret-dialog.tsx:147 msgid "Secret name" msgstr "Secret name" @@ -2472,7 +2480,7 @@ msgid "Shell" msgstr "Shell" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 +#: src/renderer/components/+workloads-pods/pod-container-env.tsx:101 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" @@ -2580,12 +2588,12 @@ msgstr "Strategy Type" msgid "Sub-object" msgstr "Sub-object" -#: src/renderer/components/dock/info-panel.tsx:104 +#: src/renderer/components/dock/info-panel.tsx:93 #: src/renderer/components/wizard/wizard.tsx:131 msgid "Submit" msgstr "Submit" -#: src/renderer/components/dock/info-panel.tsx:105 +#: src/renderer/components/dock/info-panel.tsx:94 msgid "Submitting.." msgstr "Submitting.." @@ -2627,10 +2635,14 @@ msgstr "Telemetry & usage data is collected to continuously improve the Lens exp msgid "Terminal" msgstr "Terminal" -#: src/renderer/components/dock/dock.tsx:107 +#: src/renderer/components/dock/dock.tsx:89 msgid "Terminal session" msgstr "Terminal session" +#: src/renderer/components/+preferences/kubectl-binaries.tsx:38 +msgid "The path to the kubectl binary on the system." +msgstr "The path to the kubectl binary on the system." + #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 msgid "There are no logs available for container." msgstr "There are no logs available for container." @@ -2639,11 +2651,11 @@ msgstr "There are no logs available for container." msgid "There are no logs available." msgstr "There are no logs available." -#: src/renderer/components/input/input.validators.ts:6 +#: src/renderer/components/input/input_validators.ts:6 msgid "This field is required" msgstr "This field is required" -#: src/renderer/components/input/input.validators.ts:31 +#: src/renderer/components/input/input_validators.ts:31 msgid "This field must be a valid path" msgstr "This field must be a valid path" @@ -2663,7 +2675,7 @@ msgstr "To" msgid "To help us improve the product please report bugs to {slackLink} community or {githubLink} issues tracker." msgstr "To help us improve the product please report bugs to {slackLink} community or {githubLink} issues tracker." -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:76 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:104 msgid "Tokens" msgstr "Tokens" @@ -2730,12 +2742,12 @@ msgstr "Update" msgid "Updated" msgstr "Updated" -#: src/renderer/components/dock/upgrade-chart.tsx:105 +#: src/renderer/components/dock/upgrade-chart.tsx:104 msgid "Updating.." msgstr "Updating.." #: src/renderer/components/+apps-releases/release-details.tsx:176 -#: src/renderer/components/dock/upgrade-chart.tsx:105 +#: src/renderer/components/dock/upgrade-chart.tsx:104 msgid "Upgrade" msgstr "Upgrade" @@ -2799,7 +2811,7 @@ msgstr "Values" msgid "Verbs" msgstr "Verbs" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:78 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:85 #: src/renderer/components/+apps-helm-charts/helm-charts.tsx:66 #: src/renderer/components/+apps-releases/release-details.tsx:185 #: src/renderer/components/+apps-releases/releases.tsx:91 @@ -2866,11 +2878,11 @@ msgstr "Workspaces" msgid "Workspaces are used to organize number of clusters into logical groups." msgstr "Workspaces are used to organize number of clusters into logical groups." -#: src/renderer/components/input/input.validators.ts:11 +#: src/renderer/components/input/input_validators.ts:11 msgid "Wrong email format" msgstr "Wrong email format" -#: src/renderer/components/input/input.validators.ts:26 +#: src/renderer/components/input/input_validators.ts:26 msgid "Wrong url format" msgstr "Wrong url format" @@ -2953,7 +2965,7 @@ msgstr "singular" msgid "timestamps" msgstr "timestamps" -#: src/renderer/components/dock/create-resource.tsx:55 +#: src/renderer/components/dock/create-resource.tsx:57 msgid "{0, plural, one {Resource} other {Resources}}" msgstr "{0, plural, one {Resource} other {Resources}}" @@ -3005,6 +3017,6 @@ msgstr "{resourceType} <0>{resourceName} updated." msgid "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}?} other {<2>Remove <3>{selectedCount} items <4>{selectedNames} {tail}?}}" msgstr "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}?} other {<2>Remove <3>{selectedCount} items <4>{selectedNames} {tail}?}}" -#: src/renderer/components/dock/info-panel.tsx:99 +#: src/renderer/components/dock/info-panel.tsx:88 msgid "{submitLabel} & Close" msgstr "{submitLabel} & Close" diff --git a/locales/fi/messages.po b/locales/fi/messages.po index 363b9a49cc..1b53f1bffa 100644 --- a/locales/fi/messages.po +++ b/locales/fi/messages.po @@ -49,7 +49,7 @@ msgstr "" #~ msgid "<0>Your browser does not support all Lens features. Please consider using another browser." #~ msgstr "" -#: src/renderer/components/dock/create-resource.tsx:56 +#: src/renderer/components/dock/create-resource.tsx:58 msgid "<0>{0} successfully created" msgstr "" @@ -57,7 +57,7 @@ msgstr "" #~ msgid "A HTTP proxy server URL (format: http://
:)" #~ msgstr "" -#: src/renderer/components/input/input.validators.ts:46 +#: src/renderer/components/input/input_validators.ts:46 msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." msgstr "" @@ -87,7 +87,7 @@ msgstr "" msgid "Active" msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:288 +#: src/renderer/components/+add-cluster/add-cluster.tsx:289 #: src/renderer/components/cluster-manager/clusters-menu.tsx:130 msgid "Add Cluster" msgstr "" @@ -112,7 +112,7 @@ msgstr "" #~ msgid "Add cluster" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:305 +#: src/renderer/components/+add-cluster/add-cluster.tsx:306 msgid "Add cluster(s)" msgstr "" @@ -273,7 +273,7 @@ msgstr "" msgid "App crash at <0>{pageUrl}" msgstr "" -#: src/renderer/components/dock/edit-resource.tsx:88 +#: src/renderer/components/dock/edit-resource.tsx:87 msgid "Applying.." msgstr "" @@ -404,7 +404,7 @@ msgstr "" #: src/renderer/components/+workspaces/workspaces.tsx:133 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44 -#: src/renderer/components/dock/info-panel.tsx:97 +#: src/renderer/components/dock/info-panel.tsx:85 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Cancel" msgstr "" @@ -440,7 +440,7 @@ msgstr "" msgid "Chart Release <0>{0} successfully created." msgstr "" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:105 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:124 msgid "Chart: {0}" msgstr "" @@ -643,7 +643,7 @@ msgstr "" #: src/renderer/components/+user-management-roles/add-role-dialog.tsx:73 #: src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx:212 #: src/renderer/components/+user-management-service-accounts/create-service-account-dialog.tsx:76 -#: src/renderer/components/dock/create-resource.tsx:71 +#: src/renderer/components/dock/create-resource.tsx:74 msgid "Create" msgstr "" @@ -687,7 +687,7 @@ msgstr "" msgid "Create new Service Account" msgstr "" -#: src/renderer/components/dock/dock.tsx:111 +#: src/renderer/components/dock/dock.tsx:93 msgid "Create resource" msgstr "" @@ -779,8 +779,8 @@ msgid "Default Runtime Class Name" msgstr "" #: src/renderer/components/+preferences/kubectl-binaries.tsx:30 -msgid "Default:" -msgstr "" +#~ msgid "Default:" +#~ msgstr "" #: src/renderer/components/+custom-resources/custom-resources.tsx:22 msgid "Definitions" @@ -844,15 +844,19 @@ msgstr "" msgid "Download file" msgstr "" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:39 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:24 msgid "Download kubectl binaries" msgstr "" #: src/renderer/components/+preferences/kubectl-binaries.tsx:37 -msgid "Download kubectl binaries matching to Kubernetes cluster verison." +#~ msgid "Download kubectl binaries matching to Kubernetes cluster verison." +#~ msgstr "" + +#: src/renderer/components/+preferences/kubectl-binaries.tsx:26 +msgid "Download kubectl binaries matching to Kubernetes cluster version." msgstr "" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:41 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:29 msgid "Download mirror for kubectl" msgstr "" @@ -935,7 +939,7 @@ msgstr "" msgid "Everything is fine in the Cluster" msgstr "" -#: src/renderer/components/dock/dock.tsx:116 +#: src/renderer/components/dock/dock.tsx:98 msgid "Exit full size mode" msgstr "" @@ -976,7 +980,7 @@ msgstr "" msgid "First seen" msgstr "" -#: src/renderer/components/dock/dock.tsx:116 +#: src/renderer/components/dock/dock.tsx:98 msgid "Fit to window" msgstr "" @@ -1064,7 +1068,7 @@ msgstr "" msgid "High number of replicas may cause cluster performance issues" msgstr "" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:81 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:88 msgid "Home" msgstr "" @@ -1119,7 +1123,7 @@ msgstr "" msgid "ImagePullPolicy" msgstr "" -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:80 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:108 msgid "ImagePullSecrets" msgstr "" @@ -1144,8 +1148,8 @@ msgstr "" msgid "Init Containers" msgstr "" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:76 -#: src/renderer/components/dock/install-chart.tsx:128 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:83 +#: src/renderer/components/dock/install-chart.tsx:127 msgid "Install" msgstr "" @@ -1153,15 +1157,15 @@ msgstr "" msgid "Installation complete!" msgstr "" -#: src/renderer/components/dock/install-chart.tsx:128 +#: src/renderer/components/dock/install-chart.tsx:127 msgid "Installing..." msgstr "" -#: src/renderer/components/input/input.validators.ts:50 +#: src/renderer/components/input/input_validators.ts:50 msgid "Invalid account ID" msgstr "" -#: src/renderer/components/input/input.validators.ts:16 +#: src/renderer/components/input/input_validators.ts:16 msgid "Invalid number" msgstr "" @@ -1222,13 +1226,13 @@ msgstr "" msgid "Keys" msgstr "" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:87 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:94 msgid "Keywords" msgstr "" #: src/renderer/components/+events/event-details.tsx:57 #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:79 -#: src/renderer/components/dock/edit-resource.tsx:89 +#: src/renderer/components/dock/edit-resource.tsx:88 msgid "Kind" msgstr "" @@ -1240,7 +1244,7 @@ msgstr "" msgid "Kubeconfig File" msgstr "" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:35 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:23 msgid "Kubectl Binary" msgstr "" @@ -1334,7 +1338,7 @@ msgstr "" msgid "Logs copied to clipboard." msgstr "" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:84 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:91 msgid "Maintainers" msgstr "" @@ -1360,7 +1364,7 @@ msgstr "" msgid "Max Unavailable" msgstr "" -#: src/renderer/components/input/input.validators.ts:41 +#: src/renderer/components/input/input_validators.ts:41 msgid "Maximum length is {maxLength}" msgstr "" @@ -1432,11 +1436,11 @@ msgstr "" msgid "Min Pods" msgstr "" -#: src/renderer/components/dock/dock.tsx:117 +#: src/renderer/components/dock/dock.tsx:99 msgid "Minimize" msgstr "" -#: src/renderer/components/input/input.validators.ts:36 +#: src/renderer/components/input/input_validators.ts:36 msgid "Minimum length is {minLength}" msgstr "" @@ -1445,7 +1449,7 @@ msgstr "" msgid "Mount Options" msgstr "" -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:84 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:112 msgid "Mountable secrets" msgstr "" @@ -1501,7 +1505,7 @@ msgstr "" #: src/renderer/components/+workloads-replicasets/replicasets.tsx:50 #: src/renderer/components/+workloads-statefulsets/statefulsets.tsx:40 #: src/renderer/components/+workspaces/workspaces.tsx:130 -#: src/renderer/components/dock/edit-resource.tsx:90 +#: src/renderer/components/dock/edit-resource.tsx:89 #: src/renderer/components/kube-object/kube-object-meta.tsx:20 msgid "Name" msgstr "" @@ -1547,7 +1551,7 @@ msgstr "" #: src/renderer/components/+workloads-jobs/jobs.tsx:38 #: src/renderer/components/+workloads-pods/pods.tsx:76 #: src/renderer/components/+workloads-statefulsets/statefulsets.tsx:41 -#: src/renderer/components/dock/edit-resource.tsx:91 +#: src/renderer/components/dock/edit-resource.tsx:90 #: src/renderer/components/dock/install-chart.tsx:122 #: src/renderer/components/dock/upgrade-chart.tsx:98 #: src/renderer/components/item-object-list/page-filters-select.tsx:57 @@ -1591,7 +1595,7 @@ msgstr "" msgid "New logs since opening the dialog" msgstr "" -#: src/renderer/components/dock/dock.tsx:104 +#: src/renderer/components/dock/dock.tsx:86 msgid "New tab" msgstr "" @@ -1717,7 +1721,7 @@ msgstr "" msgid "Ok, got it!" msgstr "" -#: src/renderer/components/dock/dock.tsx:117 +#: src/renderer/components/dock/dock.tsx:99 msgid "Open" msgstr "" @@ -1922,7 +1926,7 @@ msgstr "" msgid "Proxy is used only for non-cluster communication." msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:293 +#: src/renderer/components/+add-cluster/add-cluster.tsx:294 msgid "Proxy settings" msgstr "" @@ -2247,7 +2251,7 @@ msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:97 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 #: src/renderer/components/+workspaces/workspaces.tsx:132 -#: src/renderer/components/dock/edit-resource.tsx:88 +#: src/renderer/components/dock/edit-resource.tsx:87 msgid "Save" msgstr "" @@ -2301,6 +2305,10 @@ msgstr "" msgid "Secret Name" msgstr "" +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:72 +msgid "Secret is not found" +msgstr "" + #: src/renderer/components/+config-secrets/add-secret-dialog.tsx:147 msgid "Secret name" msgstr "" @@ -2455,7 +2463,7 @@ msgid "Shell" msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 +#: src/renderer/components/+workloads-pods/pod-container-env.tsx:101 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" @@ -2563,12 +2571,12 @@ msgstr "" msgid "Sub-object" msgstr "" -#: src/renderer/components/dock/info-panel.tsx:104 +#: src/renderer/components/dock/info-panel.tsx:93 #: src/renderer/components/wizard/wizard.tsx:131 msgid "Submit" msgstr "" -#: src/renderer/components/dock/info-panel.tsx:105 +#: src/renderer/components/dock/info-panel.tsx:94 msgid "Submitting.." msgstr "" @@ -2610,10 +2618,14 @@ msgstr "" msgid "Terminal" msgstr "" -#: src/renderer/components/dock/dock.tsx:107 +#: src/renderer/components/dock/dock.tsx:89 msgid "Terminal session" msgstr "" +#: src/renderer/components/+preferences/kubectl-binaries.tsx:38 +msgid "The path to the kubectl binary on the system." +msgstr "" + #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 msgid "There are no logs available for container." msgstr "" @@ -2622,11 +2634,11 @@ msgstr "" msgid "There are no logs available." msgstr "" -#: src/renderer/components/input/input.validators.ts:6 +#: src/renderer/components/input/input_validators.ts:6 msgid "This field is required" msgstr "" -#: src/renderer/components/input/input.validators.ts:31 +#: src/renderer/components/input/input_validators.ts:31 msgid "This field must be a valid path" msgstr "" @@ -2646,7 +2658,7 @@ msgstr "" msgid "To help us improve the product please report bugs to {slackLink} community or {githubLink} issues tracker." msgstr "" -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:76 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:104 msgid "Tokens" msgstr "" @@ -2713,12 +2725,12 @@ msgstr "" msgid "Updated" msgstr "" -#: src/renderer/components/dock/upgrade-chart.tsx:105 +#: src/renderer/components/dock/upgrade-chart.tsx:104 msgid "Updating.." msgstr "" #: src/renderer/components/+apps-releases/release-details.tsx:176 -#: src/renderer/components/dock/upgrade-chart.tsx:105 +#: src/renderer/components/dock/upgrade-chart.tsx:104 msgid "Upgrade" msgstr "" @@ -2782,7 +2794,7 @@ msgstr "" msgid "Verbs" msgstr "" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:78 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:85 #: src/renderer/components/+apps-helm-charts/helm-charts.tsx:66 #: src/renderer/components/+apps-releases/release-details.tsx:185 #: src/renderer/components/+apps-releases/releases.tsx:91 @@ -2849,11 +2861,11 @@ msgstr "" msgid "Workspaces are used to organize number of clusters into logical groups." msgstr "" -#: src/renderer/components/input/input.validators.ts:11 +#: src/renderer/components/input/input_validators.ts:11 msgid "Wrong email format" msgstr "" -#: src/renderer/components/input/input.validators.ts:26 +#: src/renderer/components/input/input_validators.ts:26 msgid "Wrong url format" msgstr "" @@ -2936,7 +2948,7 @@ msgstr "" msgid "timestamps" msgstr "" -#: src/renderer/components/dock/create-resource.tsx:55 +#: src/renderer/components/dock/create-resource.tsx:57 msgid "{0, plural, one {Resource} other {Resources}}" msgstr "" @@ -2988,6 +3000,6 @@ msgstr "" msgid "{selectedCount, plural, one {<0>Remove item <1>{selectedNames}?} other {<2>Remove <3>{selectedCount} items <4>{selectedNames} {tail}?}}" msgstr "" -#: src/renderer/components/dock/info-panel.tsx:99 +#: src/renderer/components/dock/info-panel.tsx:88 msgid "{submitLabel} & Close" msgstr "" diff --git a/locales/ru/messages.po b/locales/ru/messages.po index ea3d5a9731..5cbf7f603e 100644 --- a/locales/ru/messages.po +++ b/locales/ru/messages.po @@ -50,7 +50,7 @@ msgstr "<0>Отфильтровано: {itemsCount} / {allItemsCount}" #~ msgid "<0>Your browser does not support all Lens features. Please consider using another browser." #~ msgstr "<0>Ваш браузер не поддерживает все возможности Lens. Пожалуйста рассмотрите использование другого современного браузера." -#: src/renderer/components/dock/create-resource.tsx:56 +#: src/renderer/components/dock/create-resource.tsx:58 msgid "<0>{0} successfully created" msgstr "" @@ -58,7 +58,7 @@ msgstr "" #~ msgid "A HTTP proxy server URL (format: http://
:)" #~ msgstr "" -#: src/renderer/components/input/input.validators.ts:46 +#: src/renderer/components/input/input_validators.ts:46 msgid "A System Name must be lowercase DNS labels separated by dots. DNS labels are alphanumerics and dashes enclosed by alphanumerics." msgstr "Это поле может содержать только латинские буквы в нижнем регистре, номера и дефис." @@ -88,7 +88,7 @@ msgstr "Название аккаунта" msgid "Active" msgstr "Активный" -#: src/renderer/components/+add-cluster/add-cluster.tsx:288 +#: src/renderer/components/+add-cluster/add-cluster.tsx:289 #: src/renderer/components/cluster-manager/clusters-menu.tsx:130 msgid "Add Cluster" msgstr "" @@ -113,7 +113,7 @@ msgstr "Добавить привязки к {name}" #~ msgid "Add cluster" #~ msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:305 +#: src/renderer/components/+add-cluster/add-cluster.tsx:306 msgid "Add cluster(s)" msgstr "" @@ -274,7 +274,7 @@ msgstr "Версия приложения" msgid "App crash at <0>{pageUrl}" msgstr "Сбой работы приложения на <0>{pageUrl}" -#: src/renderer/components/dock/edit-resource.tsx:88 +#: src/renderer/components/dock/edit-resource.tsx:87 msgid "Applying.." msgstr "Применение.." @@ -405,7 +405,7 @@ msgstr "CPU:" #: src/renderer/components/+workspaces/workspaces.tsx:133 #: src/renderer/components/confirm-dialog/confirm-dialog.tsx:44 -#: src/renderer/components/dock/info-panel.tsx:97 +#: src/renderer/components/dock/info-panel.tsx:85 #: src/renderer/components/wizard/wizard.tsx:130 msgid "Cancel" msgstr "Отмена" @@ -441,7 +441,7 @@ msgstr "Чарт" msgid "Chart Release <0>{0} successfully created." msgstr "Релиз чарта <0>{0} успешно создан." -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:105 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:124 msgid "Chart: {0}" msgstr "Чарт: {0}" @@ -648,7 +648,7 @@ msgstr "Кол-во" #: src/renderer/components/+user-management-roles/add-role-dialog.tsx:73 #: src/renderer/components/+user-management-roles-bindings/add-role-binding-dialog.tsx:212 #: src/renderer/components/+user-management-service-accounts/create-service-account-dialog.tsx:76 -#: src/renderer/components/dock/create-resource.tsx:71 +#: src/renderer/components/dock/create-resource.tsx:74 msgid "Create" msgstr "Создать" @@ -692,7 +692,7 @@ msgstr "Создать новый секрет" msgid "Create new Service Account" msgstr "Создать новый Service Account" -#: src/renderer/components/dock/dock.tsx:111 +#: src/renderer/components/dock/dock.tsx:93 msgid "Create resource" msgstr "Создать ресурс" @@ -784,8 +784,8 @@ msgid "Default Runtime Class Name" msgstr "" #: src/renderer/components/+preferences/kubectl-binaries.tsx:30 -msgid "Default:" -msgstr "" +#~ msgid "Default:" +#~ msgstr "" #: src/renderer/components/+custom-resources/custom-resources.tsx:22 msgid "Definitions" @@ -849,15 +849,19 @@ msgstr "Домены" msgid "Download file" msgstr "Скачать файл" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:39 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:24 msgid "Download kubectl binaries" msgstr "" #: src/renderer/components/+preferences/kubectl-binaries.tsx:37 -msgid "Download kubectl binaries matching to Kubernetes cluster verison." +#~ msgid "Download kubectl binaries matching to Kubernetes cluster verison." +#~ msgstr "" + +#: src/renderer/components/+preferences/kubectl-binaries.tsx:26 +msgid "Download kubectl binaries matching to Kubernetes cluster version." msgstr "" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:41 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:29 msgid "Download mirror for kubectl" msgstr "" @@ -945,7 +949,7 @@ msgstr "В кластере все в порядке" #~ msgid "Excluded items with \"system:\" prefix" #~ msgstr "За исключением объектов с префиксом “system:”" -#: src/renderer/components/dock/dock.tsx:116 +#: src/renderer/components/dock/dock.tsx:98 msgid "Exit full size mode" msgstr "Выйти из полного размера" @@ -986,7 +990,7 @@ msgstr "Финализаторы" msgid "First seen" msgstr "Увиденно впервые" -#: src/renderer/components/dock/dock.tsx:116 +#: src/renderer/components/dock/dock.tsx:98 msgid "Fit to window" msgstr "По размеру окна" @@ -1074,7 +1078,7 @@ msgstr "Скрыть" msgid "High number of replicas may cause cluster performance issues" msgstr "Большое количество реплик может вызвать проблемы с производительностью кластера" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:81 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:88 msgid "Home" msgstr "Ссылка" @@ -1129,7 +1133,7 @@ msgstr "Изображение" msgid "ImagePullPolicy" msgstr "ImagePullPolicy" -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:80 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:108 msgid "ImagePullSecrets" msgstr "ImagePullSecrets" @@ -1154,8 +1158,8 @@ msgstr "Ingresses" msgid "Init Containers" msgstr "Контейнеры инициализации" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:76 -#: src/renderer/components/dock/install-chart.tsx:128 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:83 +#: src/renderer/components/dock/install-chart.tsx:127 msgid "Install" msgstr "Установить" @@ -1163,15 +1167,15 @@ msgstr "Установить" msgid "Installation complete!" msgstr "Установка завершена!" -#: src/renderer/components/dock/install-chart.tsx:128 +#: src/renderer/components/dock/install-chart.tsx:127 msgid "Installing..." msgstr "Установка.." -#: src/renderer/components/input/input.validators.ts:50 +#: src/renderer/components/input/input_validators.ts:50 msgid "Invalid account ID" msgstr "Неверный ID аккаунта" -#: src/renderer/components/input/input.validators.ts:16 +#: src/renderer/components/input/input_validators.ts:16 msgid "Invalid number" msgstr "Неверный номер" @@ -1232,13 +1236,13 @@ msgstr "Размер ключа" msgid "Keys" msgstr "Ключи" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:87 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:94 msgid "Keywords" msgstr "Ключевые слова" #: src/renderer/components/+events/event-details.tsx:57 #: src/renderer/components/+user-management-roles-bindings/role-binding-details.tsx:79 -#: src/renderer/components/dock/edit-resource.tsx:89 +#: src/renderer/components/dock/edit-resource.tsx:88 msgid "Kind" msgstr "Тип" @@ -1250,7 +1254,7 @@ msgstr "Файл конфигурации" msgid "Kubeconfig File" msgstr "Файл конфигурации" -#: src/renderer/components/+preferences/kubectl-binaries.tsx:35 +#: src/renderer/components/+preferences/kubectl-binaries.tsx:23 msgid "Kubectl Binary" msgstr "" @@ -1344,7 +1348,7 @@ msgstr "Логи" msgid "Logs copied to clipboard." msgstr "Скопировано." -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:84 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:91 msgid "Maintainers" msgstr "Создатели" @@ -1370,7 +1374,7 @@ msgstr "Макс. подов" msgid "Max Unavailable" msgstr "" -#: src/renderer/components/input/input.validators.ts:41 +#: src/renderer/components/input/input_validators.ts:41 msgid "Maximum length is {maxLength}" msgstr "Максимальная длина {maxLength}" @@ -1442,11 +1446,11 @@ msgstr "" msgid "Min Pods" msgstr "Мин. подов" -#: src/renderer/components/dock/dock.tsx:117 +#: src/renderer/components/dock/dock.tsx:99 msgid "Minimize" msgstr "Минимизировать" -#: src/renderer/components/input/input.validators.ts:36 +#: src/renderer/components/input/input_validators.ts:36 msgid "Minimum length is {minLength}" msgstr "Минимальная длина {minLength}" @@ -1455,7 +1459,7 @@ msgstr "Минимальная длина {minLength}" msgid "Mount Options" msgstr "Опции монтирования" -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:84 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:112 msgid "Mountable secrets" msgstr "Монтируемые секреты" @@ -1511,7 +1515,7 @@ msgstr "Установки" #: src/renderer/components/+workloads-replicasets/replicasets.tsx:50 #: src/renderer/components/+workloads-statefulsets/statefulsets.tsx:40 #: src/renderer/components/+workspaces/workspaces.tsx:130 -#: src/renderer/components/dock/edit-resource.tsx:90 +#: src/renderer/components/dock/edit-resource.tsx:89 #: src/renderer/components/kube-object/kube-object-meta.tsx:20 msgid "Name" msgstr "Имя" @@ -1557,7 +1561,7 @@ msgstr "" #: src/renderer/components/+workloads-jobs/jobs.tsx:38 #: src/renderer/components/+workloads-pods/pods.tsx:76 #: src/renderer/components/+workloads-statefulsets/statefulsets.tsx:41 -#: src/renderer/components/dock/edit-resource.tsx:91 +#: src/renderer/components/dock/edit-resource.tsx:90 #: src/renderer/components/dock/install-chart.tsx:122 #: src/renderer/components/dock/upgrade-chart.tsx:98 #: src/renderer/components/item-object-list/page-filters-select.tsx:57 @@ -1601,7 +1605,7 @@ msgstr "Network Policies" msgid "New logs since opening the dialog" msgstr "Новые логи с момента открытия диалога" -#: src/renderer/components/dock/dock.tsx:104 +#: src/renderer/components/dock/dock.tsx:86 msgid "New tab" msgstr "Новая вкладка" @@ -1735,7 +1739,7 @@ msgstr "Ок" msgid "Ok, got it!" msgstr "" -#: src/renderer/components/dock/dock.tsx:117 +#: src/renderer/components/dock/dock.tsx:99 msgid "Open" msgstr "Открыть" @@ -1940,7 +1944,7 @@ msgstr "Комиссия" msgid "Proxy is used only for non-cluster communication." msgstr "" -#: src/renderer/components/+add-cluster/add-cluster.tsx:293 +#: src/renderer/components/+add-cluster/add-cluster.tsx:294 msgid "Proxy settings" msgstr "" @@ -2265,7 +2269,7 @@ msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:97 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 #: src/renderer/components/+workspaces/workspaces.tsx:132 -#: src/renderer/components/dock/edit-resource.tsx:88 +#: src/renderer/components/dock/edit-resource.tsx:87 msgid "Save" msgstr "Сохранить" @@ -2319,6 +2323,10 @@ msgstr "Секрет" msgid "Secret Name" msgstr "Название секрета" +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:72 +msgid "Secret is not found" +msgstr "" + #: src/renderer/components/+config-secrets/add-secret-dialog.tsx:147 msgid "Secret name" msgstr "Имя секрета" @@ -2473,7 +2481,7 @@ msgid "Shell" msgstr "Командная строка" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 +#: src/renderer/components/+workloads-pods/pod-container-env.tsx:101 #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" @@ -2581,12 +2589,12 @@ msgstr "Тип стратегии" msgid "Sub-object" msgstr "Суб-объект" -#: src/renderer/components/dock/info-panel.tsx:104 +#: src/renderer/components/dock/info-panel.tsx:93 #: src/renderer/components/wizard/wizard.tsx:131 msgid "Submit" msgstr "Отправить" -#: src/renderer/components/dock/info-panel.tsx:105 +#: src/renderer/components/dock/info-panel.tsx:94 msgid "Submitting.." msgstr "Применение.." @@ -2628,10 +2636,14 @@ msgstr "" msgid "Terminal" msgstr "Терминал" -#: src/renderer/components/dock/dock.tsx:107 +#: src/renderer/components/dock/dock.tsx:89 msgid "Terminal session" msgstr "Сессия терминала" +#: src/renderer/components/+preferences/kubectl-binaries.tsx:38 +msgid "The path to the kubectl binary on the system." +msgstr "" + #: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 msgid "There are no logs available for container." msgstr "Для контейнера нет логов." @@ -2640,11 +2652,11 @@ msgstr "Для контейнера нет логов." msgid "There are no logs available." msgstr "Логи отсутствуют." -#: src/renderer/components/input/input.validators.ts:6 +#: src/renderer/components/input/input_validators.ts:6 msgid "This field is required" msgstr "Это обязательное поле" -#: src/renderer/components/input/input.validators.ts:31 +#: src/renderer/components/input/input_validators.ts:31 msgid "This field must be a valid path" msgstr "" @@ -2664,7 +2676,7 @@ msgstr "Из" msgid "To help us improve the product please report bugs to {slackLink} community or {githubLink} issues tracker." msgstr "Чтобы помочь нам улучшить продукт пожалуйста отправляйте ошибки на {slackLink} сообщество или {githubLink} трекер ошибок." -#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:76 +#: src/renderer/components/+user-management-service-accounts/service-accounts-details.tsx:104 msgid "Tokens" msgstr "Токены" @@ -2731,12 +2743,12 @@ msgstr "Обновить" msgid "Updated" msgstr "Обновлено" -#: src/renderer/components/dock/upgrade-chart.tsx:105 +#: src/renderer/components/dock/upgrade-chart.tsx:104 msgid "Updating.." msgstr "Обновление.." #: src/renderer/components/+apps-releases/release-details.tsx:176 -#: src/renderer/components/dock/upgrade-chart.tsx:105 +#: src/renderer/components/dock/upgrade-chart.tsx:104 msgid "Upgrade" msgstr "Обновить" @@ -2800,7 +2812,7 @@ msgstr "Конфигурация" msgid "Verbs" msgstr "Определения" -#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:78 +#: src/renderer/components/+apps-helm-charts/helm-chart-details.tsx:85 #: src/renderer/components/+apps-helm-charts/helm-charts.tsx:66 #: src/renderer/components/+apps-releases/release-details.tsx:185 #: src/renderer/components/+apps-releases/releases.tsx:91 @@ -2867,11 +2879,11 @@ msgstr "" msgid "Workspaces are used to organize number of clusters into logical groups." msgstr "" -#: src/renderer/components/input/input.validators.ts:11 +#: src/renderer/components/input/input_validators.ts:11 msgid "Wrong email format" msgstr "Неверный формат электронной почты" -#: src/renderer/components/input/input.validators.ts:26 +#: src/renderer/components/input/input_validators.ts:26 msgid "Wrong url format" msgstr "Неверный url формат" @@ -2954,7 +2966,7 @@ msgstr "" msgid "timestamps" msgstr "временные метки" -#: src/renderer/components/dock/create-resource.tsx:55 +#: src/renderer/components/dock/create-resource.tsx:57 msgid "{0, plural, one {Resource} other {Resources}}" msgstr "{0, plural, one {Ресурс} few {Ресурсы} many {Ресурсы} other {Ресурсы}}" @@ -3013,6 +3025,6 @@ msgstr "" "other {<2>Удалить <3>{selectedCount} элементов <4>{selectedNames} {tail}?}\n" "}" -#: src/renderer/components/dock/info-panel.tsx:99 +#: src/renderer/components/dock/info-panel.tsx:88 msgid "{submitLabel} & Close" msgstr "{submitLabel} и закрыть" diff --git a/package.json b/package.json index 059ffc63ef..0d1589db30 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ ] }, "jest": { - "testRegex": ".*_(spec|test)\\.[jt]sx?$", "collectCoverage": false, "verbose": true, "testEnvironment": "node", diff --git a/src/common/cluster-store_test.ts b/src/common/__tests__/cluster-store.test.ts similarity index 66% rename from src/common/cluster-store_test.ts rename to src/common/__tests__/cluster-store.test.ts index 3c0369def3..724a83f0d7 100644 --- a/src/common/cluster-store_test.ts +++ b/src/common/__tests__/cluster-store.test.ts @@ -1,9 +1,9 @@ import fs from "fs"; import mockFs from "mock-fs"; import yaml from "js-yaml"; -import { Cluster } from "../main/cluster"; -import { ClusterStore } from "./cluster-store"; -import { workspaceStore } from "./workspace-store"; +import { Cluster } from "../../main/cluster"; +import { ClusterStore } from "../cluster-store"; +import { workspaceStore } from "../workspace-store"; const testDataIcon = fs.readFileSync("test-data/cluster-store-migration-icon.png") @@ -12,7 +12,7 @@ console.log("") // fix bug let clusterStore: ClusterStore; describe("empty config", () => { - beforeAll(() => { + beforeEach(() => { ClusterStore.resetInstance(); const mockOpts = { 'tmp': { @@ -24,109 +24,120 @@ describe("empty config", () => { return clusterStore.load(); }) - afterAll(() => { + afterEach(() => { mockFs.restore(); }) - it("adds new cluster to store", async () => { - const cluster = new Cluster({ - id: "foo", - contextName: "minikube", - preferences: { - terminalCWD: "/tmp", - icon: "data:;base64,iVBORw0KGgoAAAANSUhEUgAAA1wAAAKoCAYAAABjkf5", - clusterName: "minikube" - }, - kubeConfigPath: ClusterStore.embedCustomKubeConfig("foo", "fancy foo config"), - workspace: workspaceStore.currentWorkspaceId + describe("with foo cluster added", () => { + beforeEach(() => { + clusterStore.addCluster( + new Cluster({ + id: "foo", + contextName: "minikube", + preferences: { + terminalCWD: "/tmp", + icon: "data:image/jpeg;base64, iVBORw0KGgoAAAANSUhEUgAAA1wAAAKoCAYAAABjkf5", + clusterName: "minikube" + }, + kubeConfigPath: ClusterStore.embedCustomKubeConfig("foo", "fancy foo config"), + workspace: workspaceStore.currentWorkspaceId + }) + ); + }) + + it("adds new cluster to store", async () => { + const storedCluster = clusterStore.getById("foo"); + expect(storedCluster.id).toBe("foo"); + expect(storedCluster.preferences.terminalCWD).toBe("/tmp"); + expect(storedCluster.preferences.icon).toBe("data:image/jpeg;base64, iVBORw0KGgoAAAANSUhEUgAAA1wAAAKoCAYAAABjkf5"); + }) + + it("adds cluster to default workspace", () => { + const storedCluster = clusterStore.getById("foo"); + expect(storedCluster.workspace).toBe("default"); + }) + + it("removes cluster from store", async () => { + await clusterStore.removeById("foo"); + expect(clusterStore.getById("foo")).toBeUndefined(); + }) + + it("sets active cluster", () => { + clusterStore.setActive("foo"); + expect(clusterStore.activeCluster.id).toBe("foo"); + }) + }) + + describe("with prod and dev clusters added", () => { + beforeEach(() => { + clusterStore.addCluster( + new Cluster({ + id: "prod", + contextName: "prod", + preferences: { + clusterName: "prod" + }, + kubeConfigPath: ClusterStore.embedCustomKubeConfig("prod", "fancy config"), + workspace: "workstation" + }), + new Cluster({ + id: "dev", + contextName: "dev", + preferences: { + clusterName: "dev" + }, + kubeConfigPath: ClusterStore.embedCustomKubeConfig("dev", "fancy config"), + workspace: "workstation" + }) + ) + }) + + it("check if store can contain multiple clusters", () => { + expect(clusterStore.hasClusters()).toBeTruthy(); + expect(clusterStore.clusters.size).toBe(2); }); - clusterStore.addCluster(cluster); - const storedCluster = clusterStore.getById(cluster.id); - expect(storedCluster.id).toBe(cluster.id); - expect(storedCluster.preferences.terminalCWD).toBe(cluster.preferences.terminalCWD); - expect(storedCluster.preferences.icon).toBe(cluster.preferences.icon); - }) - it("adds cluster to default workspace", () => { - const storedCluster = clusterStore.getById("foo"); - expect(storedCluster.workspace).toBe("default"); - }) + it("gets clusters by workspaces", () => { + const wsClusters = clusterStore.getByWorkspaceId("workstation"); + const defaultClusters = clusterStore.getByWorkspaceId("default"); + expect(defaultClusters.length).toBe(0); + expect(wsClusters.length).toBe(2); + expect(wsClusters[0].id).toBe("prod"); + expect(wsClusters[1].id).toBe("dev"); + }) - it("check if store can contain multiple clusters", () => { - const prodCluster = new Cluster({ - id: "prod", - contextName: "prod", - preferences: { - clusterName: "prod" - }, - kubeConfigPath: ClusterStore.embedCustomKubeConfig("prod", "fancy config"), - workspace: "workstation" - }); - const devCluster = new Cluster({ - id: "dev", - contextName: "dev", - preferences: { - clusterName: "dev" - }, - kubeConfigPath: ClusterStore.embedCustomKubeConfig("dev", "fancy config"), - workspace: "workstation" - }); - clusterStore.addCluster(prodCluster); - clusterStore.addCluster(devCluster); - expect(clusterStore.hasClusters()).toBeTruthy(); - expect(clusterStore.clusters.size).toBe(3); - }); + it("check if cluster's kubeconfig file saved", () => { + const file = ClusterStore.embedCustomKubeConfig("boo", "kubeconfig"); + expect(fs.readFileSync(file, "utf8")).toBe("kubeconfig"); + }) - it("gets clusters by workspaces", () => { - const wsClusters = clusterStore.getByWorkspaceId("workstation"); - const defaultClusters = clusterStore.getByWorkspaceId("default"); - expect(defaultClusters.length).toBe(1); - expect(wsClusters.length).toBe(2); - expect(wsClusters[0].id).toBe("prod"); - expect(wsClusters[1].id).toBe("dev"); - }) + it("check if reorderring works for same from and to", () => { + clusterStore.swapIconOrders("workstation", 1, 1) - it("sets active cluster", () => { - clusterStore.setActive("foo"); - expect(clusterStore.activeCluster.id).toBe("foo"); - }) + const clusters = clusterStore.getByWorkspaceId("workstation"); + expect(clusters[0].id).toBe("prod") + expect(clusters[0].preferences.iconOrder).toBe(0) + expect(clusters[1].id).toBe("dev") + expect(clusters[1].preferences.iconOrder).toBe(1) + }) - it("check if cluster's kubeconfig file saved", () => { - const file = ClusterStore.embedCustomKubeConfig("boo", "kubeconfig"); - expect(fs.readFileSync(file, "utf8")).toBe("kubeconfig"); - }) + it("check if reorderring works for different from and to", () => { + clusterStore.swapIconOrders("workstation", 0, 1) - it("check if reorderring works for same from and to", () => { - clusterStore.swapIconOrders("workstation", 1, 1) + const clusters = clusterStore.getByWorkspaceId("workstation"); + expect(clusters[0].id).toBe("dev") + expect(clusters[0].preferences.iconOrder).toBe(0) + expect(clusters[1].id).toBe("prod") + expect(clusters[1].preferences.iconOrder).toBe(1) + }) - const clusters = clusterStore.getByWorkspaceId("workstation"); - expect(clusters[0].id).toBe("prod") - expect(clusters[0].preferences.iconOrder).toBe(0) - expect(clusters[1].id).toBe("dev") - expect(clusters[1].preferences.iconOrder).toBe(1) - }); + it("check if after icon reordering, changing workspaces still works", () => { + clusterStore.swapIconOrders("workstation", 1, 1) + clusterStore.getById("prod").workspace = "default" - it("check if reorderring works for different from and to", () => { - clusterStore.swapIconOrders("workstation", 0, 1) - - const clusters = clusterStore.getByWorkspaceId("workstation"); - expect(clusters[0].id).toBe("dev") - expect(clusters[0].preferences.iconOrder).toBe(0) - expect(clusters[1].id).toBe("prod") - expect(clusters[1].preferences.iconOrder).toBe(1) - }); - - it("check if after icon reordering, changing workspaces still works", () => { - clusterStore.swapIconOrders("workstation", 1, 1) - clusterStore.getById("prod").workspace = "default" - - expect(clusterStore.getByWorkspaceId("workstation").length).toBe(1); - expect(clusterStore.getByWorkspaceId("default").length).toBe(2); - }); - - it("removes cluster from store", async () => { - await clusterStore.removeById("foo"); - expect(clusterStore.getById("foo")).toBeUndefined(); + expect(clusterStore.getByWorkspaceId("workstation").length).toBe(1); + expect(clusterStore.getByWorkspaceId("default").length).toBe(1); + }) }) }) diff --git a/src/common/user-store_test.ts b/src/common/__tests__/user-store.test.ts similarity index 98% rename from src/common/user-store_test.ts rename to src/common/__tests__/user-store.test.ts index 4e9efe97d8..e361397565 100644 --- a/src/common/user-store_test.ts +++ b/src/common/__tests__/user-store.test.ts @@ -10,7 +10,7 @@ jest.mock("electron", () => { } }) -import { UserStore } from "./user-store" +import { UserStore } from "../user-store" import { SemVer } from "semver" import electron from "electron" diff --git a/src/common/workspace-store_test.ts b/src/common/__tests__/workspace-store.test.ts similarity index 98% rename from src/common/workspace-store_test.ts rename to src/common/__tests__/workspace-store.test.ts index 232f0b013a..8ac3ac599d 100644 --- a/src/common/workspace-store_test.ts +++ b/src/common/__tests__/workspace-store.test.ts @@ -10,7 +10,7 @@ jest.mock("electron", () => { } }) -import { WorkspaceStore } from "./workspace-store" +import { WorkspaceStore } from "../workspace-store" describe("workspace store tests", () => { describe("for an empty config", () => { diff --git a/src/common/utils/splitArray_test.ts b/src/common/utils/__tests__/splitArray.test.ts similarity index 95% rename from src/common/utils/splitArray_test.ts rename to src/common/utils/__tests__/splitArray.test.ts index ede542d605..a401e07701 100644 --- a/src/common/utils/splitArray_test.ts +++ b/src/common/utils/__tests__/splitArray.test.ts @@ -1,4 +1,4 @@ -import { splitArray } from "./splitArray"; +import { splitArray } from "../splitArray"; describe("split array on element tests", () => { test("empty array", () => { @@ -16,7 +16,7 @@ describe("split array on element tests", () => { test("one elements, in array", () => { expect(splitArray([1], 1)).toStrictEqual([[], [], true]); }); - + test("ten elements, in front array", () => { expect(splitArray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 0)).toStrictEqual([[], [1, 2, 3, 4, 5, 6, 7, 8, 9], true]); }); diff --git a/src/renderer/api/kube-api-parse_test.ts b/src/renderer/api/__tests__/kube-api-parse.test.ts similarity index 89% rename from src/renderer/api/kube-api-parse_test.ts rename to src/renderer/api/__tests__/kube-api-parse.test.ts index dee3bf031d..c2aec7fd58 100644 --- a/src/renderer/api/kube-api-parse_test.ts +++ b/src/renderer/api/__tests__/kube-api-parse.test.ts @@ -1,11 +1,11 @@ -import { IKubeApiParsed, parseKubeApi } from "./kube-api-parse"; +import { IKubeApiParsed, parseKubeApi } from "../kube-api-parse"; -interface KubeApi_Parse_Test { +interface KubeApiParseTestData { url: string; expected: Required; } -const tests: KubeApi_Parse_Test[] = [ +const tests: KubeApiParseTestData[] = [ { url: "/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/prometheuses.monitoring.coreos.com", expected: { @@ -125,11 +125,10 @@ const tests: KubeApi_Parse_Test[] = [ }, ]; -describe.only("parseApi unit tests", () => { - for (const i in tests) { - const { url: tUrl, expected:tExpect} = tests[i]; - test(`test #${parseInt(i)+1}`, () => { - expect(parseKubeApi(tUrl)).toStrictEqual(tExpect); +describe("parseApi unit tests", () => { + for (const { url, expected } of tests) { + test(`testing "${url}"`, () => { + expect(parseKubeApi(url)).toStrictEqual(expected); }); } }); diff --git a/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx b/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx index a11f8aed6e..54d76c08eb 100644 --- a/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx +++ b/src/renderer/components/+cluster-settings/components/cluster-name-setting.tsx @@ -4,7 +4,7 @@ import { Input } from "../../input"; import { observable, autorun } from "mobx"; import { observer, disposeOnUnmount } from "mobx-react"; import { SubTitle } from "../../layout/sub-title"; -import { isRequired } from "../../input/input.validators"; +import { isRequired } from "../../input/input_validators"; interface Props { cluster: Cluster; @@ -33,7 +33,7 @@ export class ClusterNameSetting extends React.Component { render() { return ( <> - +

Define cluster name.

{ render() { return ( <> - +

HTTP Proxy server. Used for communicating with Kubernetes API.

{ const isCount = quota.startsWith("count/"); const icon = isCompute ? "memory" : isStorage ? "storage" : isCount ? "looks_one" : ""; return { - label: icon ? {quota} : quota, + label: icon ? {quota} : quota, value: quota, }; }); @@ -151,7 +151,7 @@ export class AddQuotaDialog extends React.Component { /> - Namespace}/> + Namespace} /> { onChange={({ value }) => this.namespace = value} /> - Values}/> + Values} />
{
- Namespace}/> + Namespace} /> { />
- Secret type}/> + Secret type} /> this.name = v.toLowerCase()} /> - Namespace}/> + Namespace} /> { } diff --git a/src/renderer/components/+workspaces/workspaces.tsx b/src/renderer/components/+workspaces/workspaces.tsx index a2e7dbf74f..3cd5e71f82 100644 --- a/src/renderer/components/+workspaces/workspaces.tsx +++ b/src/renderer/components/+workspaces/workspaces.tsx @@ -12,7 +12,7 @@ import { Icon } from "../icon"; import { Input } from "../input"; import { cssNames, prevDefault } from "../../utils"; import { Button } from "../button"; -import { isRequired, Validator } from "../input/input.validators"; +import { isRequired, Validator } from "../input/input_validators"; @observer export class Workspaces extends React.Component { diff --git a/src/renderer/components/input/input.validators_test.ts b/src/renderer/components/input/__tests__/input_validators.test.ts similarity index 97% rename from src/renderer/components/input/input.validators_test.ts rename to src/renderer/components/input/__tests__/input_validators.test.ts index 4477d63e93..7bf08ffbdb 100644 --- a/src/renderer/components/input/input.validators_test.ts +++ b/src/renderer/components/input/__tests__/input_validators.test.ts @@ -1,4 +1,4 @@ -import { isEmail, systemName } from "./input.validators"; +import { isEmail, systemName } from "../input_validators"; describe("input validation tests", () => { describe("isEmail tests", () => { diff --git a/src/renderer/components/input/input.tsx b/src/renderer/components/input/input.tsx index c109735927..224f7f953e 100644 --- a/src/renderer/components/input/input.tsx +++ b/src/renderer/components/input/input.tsx @@ -3,7 +3,7 @@ import "./input.scss"; import React, { DOMAttributes, InputHTMLAttributes, TextareaHTMLAttributes } from "react"; import { autobind, cssNames, debouncePromise } from "../../utils"; import { Icon } from "../icon"; -import { conditionalValidators, Validator } from "./input.validators"; +import { conditionalValidators, Validator } from "./input_validators"; import isString from "lodash/isString" import isFunction from "lodash/isFunction" import isBoolean from "lodash/isBoolean" @@ -288,9 +288,9 @@ export class Input extends React.Component { return (