From e682c7de45cd508dcd3a0813ed9a6865d58d21c3 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 27 Jul 2022 18:44:11 +0300 Subject: [PATCH] Fix editing of kube resource (#5906) --- .../edit-namespace-from-new-tab.test.tsx.snap | 11084 ++++++++++++++++ ...e-from-previously-opened-tab.test.tsx.snap | 1188 ++ .../edit-namespace-from-new-tab.test.tsx | 991 ++ ...espace-from-previously-opened-tab.test.tsx | 172 + ...lling-helm-chart-from-new-tab.test.ts.snap | 91 +- ...rt-from-previously-opened-tab.test.ts.snap | 7 +- ...wing-details-for-helm-release.test.ts.snap | 42 +- src/common/cluster/is-allowed-resource.ts | 20 + .../cluster-role-binding.api.injectable.ts | 3 + .../endpoints/cluster-role.api.injectable.ts | 3 + .../endpoints/cluster.api.injectable.ts | 3 + .../component-status.api.injectable.ts | 3 + .../endpoints/config-map.api.injectable.ts | 3 + .../endpoints/cron-job.api.injectable.ts | 3 + ...stom-resource-definition.api.injectable.ts | 3 + .../endpoints/daemon-set.api.injectable.ts | 3 + .../endpoints/deployment.api.injectable.ts | 3 + .../endpoints/endpoint.api.injectable.ts | 3 + .../endpoints/events.api.injectable.ts | 3 + ...orizontal-pod-autoscaler.api.injectable.ts | 3 + .../endpoints/ingress.api.injectable.ts | 3 + .../k8s-api/endpoints/job.api.injectable.ts | 3 + .../endpoints/limit-range.api.injectable.ts | 3 + .../endpoints/namespace.api.injectable.ts | 4 + .../network-policy.api.injectable.ts | 3 + .../k8s-api/endpoints/node.api.injectable.ts | 3 + .../persistent-volume-claim.api.injectable.ts | 3 + .../persistent-volume.api.injectable.ts | 3 + .../pod-disruption-budget.api.injectable.ts | 3 + .../endpoints/pod-metrics.api.injectable.ts | 3 + .../pod-security-policy.api.injectable.ts | 3 + .../k8s-api/endpoints/pod.api.injectable.ts | 4 + .../priority-class.api.injectable.ts | 3 + .../endpoints/replica-set.api.injectable.ts | 3 + .../resource-quota.api.injectable.ts | 3 + .../endpoints/role-binding.api.injectable.ts | 3 + .../k8s-api/endpoints/role.api.injectable.ts | 3 + .../endpoints/secret.api.injectable.ts | 3 + ...lf-subject-rules-reviews.api.injectable.ts | 3 + .../service-account.api.injectable.ts | 3 + .../endpoints/service.api.injectable.ts | 3 + .../endpoints/stateful-set.api.injectable.ts | 3 + .../endpoints/storage-class.api.injectable.ts | 3 + .../get-kube-api-from-path.injectable.ts | 26 + .../kube-api/kube-api-injection-token.ts | 10 + ...resource.global-override-for-injectable.ts | 12 + .../call-for-patch-resource.injectable.ts | 49 + ...resource.global-override-for-injectable.ts | 12 + .../call-for-resource.injectable.ts | 50 + .../edit-resource-model.injectable.tsx | 183 + .../edit-resource-tab.injectable.ts | 80 +- ...dom-id-for-edit-resource-tab.injectable.ts | 13 + .../dock/edit-resource/store.injectable.ts | 2 - .../components/dock/edit-resource/store.ts | 41 +- .../components/dock/edit-resource/view.tsx | 215 +- src/renderer/components/dock/info-panel.tsx | 2 + .../monaco-editor/__mocks__/monaco-editor.tsx | 2 +- .../test-utils/get-application-builder.tsx | 18 +- .../create-storage/storages-are-ready.ts | 4 +- 59 files changed, 14123 insertions(+), 298 deletions(-) create mode 100644 src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap create mode 100644 src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap create mode 100644 src/behaviours/cluster/namespaces/edit-namespace-from-new-tab.test.tsx create mode 100644 src/behaviours/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx create mode 100644 src/common/cluster/is-allowed-resource.ts create mode 100644 src/common/k8s-api/kube-api/get-kube-api-from-path.injectable.ts create mode 100644 src/common/k8s-api/kube-api/kube-api-injection-token.ts create mode 100644 src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.global-override-for-injectable.ts create mode 100644 src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable.ts create mode 100644 src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.global-override-for-injectable.ts create mode 100644 src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable.ts create mode 100644 src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx create mode 100644 src/renderer/components/dock/edit-resource/get-random-id-for-edit-resource-tab.injectable.ts diff --git a/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap new file mode 100644 index 0000000000..3ae620ccf6 --- /dev/null +++ b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap @@ -0,0 +1,11084 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with failure renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+ Resource not found +
+
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given change in configuration renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given clicking the context menu for second namespace, when clicking to edit namespace renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given clicking the context menu for second namespace, when clicking to edit namespace when second namespace resolves renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-other-name +
+ + Namespace: + +
+ default +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given clicking the context menu for second namespace, when clicking to edit namespace when second namespace resolves when clicking dock tab for the first namespace renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given invalid change in configuration renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+
+ + + error_outline + + +
+ YAMLException: end of the stream or a document separator is expected (1:1) + + 1 | @some-invalid-configuration@ +-----^ +
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given no changes in the configuration, when selecting to save renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+
+ + Applying... +
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given no changes in the configuration, when selecting to save when saving resolves with failure renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given no changes in the configuration, when selecting to save when saving resolves with success renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace when selecting to cancel renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace when selecting to save and close renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+
+ + Applying... +
+ + + +
+ +
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace when selecting to save and close when saving resolves with failure renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace when selecting to save and close when saving resolves with success renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves without namespace renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 0 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+ Item list is empty +
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+ Resource not found +
+
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap new file mode 100644 index 0000000000..25a80a2702 --- /dev/null +++ b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap @@ -0,0 +1,1188 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`cluster/namespaces - edit namespaces from previously opened tab given tab was previously opened, when application is started renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+
+
+ +`; + +exports[`cluster/namespaces - edit namespaces from previously opened tab given tab was previously opened, when application is started when call for namespace resolves with namespace renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Kind: + +
+ Namespace +
+ + Name: + +
+ some-name +
+ + Namespace: + +
+ default +
+
+
+
+ + + +
+ +
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/namespaces/edit-namespace-from-new-tab.test.tsx b/src/behaviours/cluster/namespaces/edit-namespace-from-new-tab.test.tsx new file mode 100644 index 0000000000..49610f138d --- /dev/null +++ b/src/behaviours/cluster/namespaces/edit-namespace-from-new-tab.test.tsx @@ -0,0 +1,991 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { DiContainer } from "@ogre-tools/injectable"; +import type { RenderResult } from "@testing-library/react"; +import { fireEvent } from "@testing-library/react"; +import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import navigateToNamespacesInjectable from "../../../common/front-end-routing/routes/cluster/namespaces/navigate-to-namespaces.injectable"; +import React from "react"; +import createEditResourceTabInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-tab.injectable"; +import getRandomIdForEditResourceTabInjectable from "../../../renderer/components/dock/edit-resource/get-random-id-for-edit-resource-tab.injectable"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; +import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; +import type { CallForPatchResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable"; +import callForPatchResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable"; +import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable"; +import { Namespace } from "../../../common/k8s-api/endpoints"; +import showSuccessNotificationInjectable from "../../../renderer/components/notifications/show-success-notification.injectable"; +import showErrorNotificationInjectable from "../../../renderer/components/notifications/show-error-notification.injectable"; +import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable"; +import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; +import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable"; +import { controlWhenStoragesAreReady } from "../../../renderer/utils/create-storage/storages-are-ready"; + +jest.mock("../../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: + (Target: any) => + ({ tooltip, ...props }: any) => { + if (tooltip) { + const testId = props["data-testid"]; + + return ( + <> + +
+ {tooltip.children || tooltip} +
+ + ); + } + + return ; + }, +})); + +describe("cluster/namespaces - edit namespace from new tab", () => { + let builder: ApplicationBuilder; + let callForNamespaceMock: AsyncFnMock; + let callForPatchNamespaceMock: AsyncFnMock; + let showSuccessNotificationMock: jest.Mock; + let showErrorNotificationMock: jest.Mock; + let storagesAreReady: () => Promise; + + beforeEach(() => { + builder = getApplicationBuilder(); + + builder.setEnvironmentToClusterFrame(); + + callForNamespaceMock = asyncFn(); + callForPatchNamespaceMock = asyncFn(); + + showSuccessNotificationMock = jest.fn(); + showErrorNotificationMock = jest.fn(); + + builder.beforeApplicationStart(({ rendererDi }) => { + rendererDi.override( + directoryForLensLocalStorageInjectable, + () => "/some-directory-for-lens-local-storage", + ); + + rendererDi.override(hostedClusterIdInjectable, () => "some-cluster-id"); + + storagesAreReady = controlWhenStoragesAreReady(rendererDi); + + rendererDi.override( + showSuccessNotificationInjectable, + () => showSuccessNotificationMock, + ); + + rendererDi.override( + showErrorNotificationInjectable, + () => showErrorNotificationMock, + ); + + rendererDi.override(getRandomIdForEditResourceTabInjectable, () => + jest + .fn(() => "some-irrelevant-random-id") + .mockReturnValueOnce("some-first-tab-id") + .mockReturnValueOnce("some-second-tab-id"), + ); + + rendererDi.override(callForResourceInjectable, () => async (selfLink: string) => { + if ( + [ + "/apis/some-api-version/namespaces/some-uid", + "/apis/some-api-version/namespaces/some-other-uid", + ].includes(selfLink) + ) { + return await callForNamespaceMock(selfLink); + } + + return undefined; + }); + + rendererDi.override(callForPatchResourceInjectable, () => async (namespace, ...args) => { + if ( + [ + "/apis/some-api-version/namespaces/some-uid", + "/apis/some-api-version/namespaces/some-other-uid", + ].includes(namespace.selfLink) + ) { + return await callForPatchNamespaceMock(namespace, ...args); + } + + return undefined; + }); + }); + + builder.allowKubeResource("namespaces"); + }); + + describe("when navigating to namespaces", () => { + let rendered: RenderResult; + let rendererDi: DiContainer; + + beforeEach(async () => { + rendered = await builder.render(); + + await storagesAreReady(); + + rendererDi = builder.dis.rendererDi; + + const navigateToNamespaces = rendererDi.inject( + navigateToNamespacesInjectable, + ); + + navigateToNamespaces(); + + const dockStore = rendererDi.inject(dockStoreInjectable); + + // TODO: Make TerminalWindow unit testable to allow realistic behaviour + dockStore.closeTab("terminal"); + }); + + // TODO: Implement skipped tests when loading of resources can be tested + xit("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + xit("calls for namespaces", () => { + + }); + + xit("shows spinner", () => { + + }); + + describe("when namespaces resolve", () => { + beforeEach(() => { + + }); + + xit("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + xit("does not show spinner anymore", () => { + + }); + + describe("when clicking the context menu for a namespace", () => { + beforeEach(() => { + + }); + + xit("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + xit("does not show edit resource tab yet", () => { + + }); + + describe("when clicking to edit namespace", () => { + beforeEach(() => { + // TODO: Make implementation match the description (tests above) + const namespaceStub = new Namespace(someNamespaceDataStub); + + const createEditResourceTab = rendererDi.inject(createEditResourceTabInjectable); + + createEditResourceTab(namespaceStub); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows dock tab for editing namespace", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + it("shows spinner in the dock tab", () => { + expect( + rendered.getByTestId("edit-resource-tab-spinner"), + ).toBeInTheDocument(); + }); + + it("calls for namespace", () => { + expect(callForNamespaceMock).toHaveBeenCalledWith( + "/apis/some-api-version/namespaces/some-uid", + ); + }); + + describe("when call for namespace resolves with namespace", () => { + let someNamespace: Namespace; + + beforeEach(async () => { + someNamespace = new Namespace({ + apiVersion: "some-api-version", + kind: "Namespace", + + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + selfLink: "/apis/some-api-version/namespaces/some-uid", + somePropertyToBeRemoved: "some-value", + somePropertyToBeChanged: "some-old-value", + }, + }); + + await callForNamespaceMock.resolve({ + callWasSuccessful: true, + response: someNamespace, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show spinner anymore", () => { + expect( + rendered.queryByTestId("edit-resource-tab-spinner"), + ).not.toBeInTheDocument(); + }); + + it("has the configuration in editor", () => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLTextAreaElement; + + expect(input.value).toBe(`apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid + somePropertyToBeRemoved: some-value + somePropertyToBeChanged: some-old-value +`); + }); + + describe("given no changes in the configuration, when selecting to save", () => { + beforeEach(() => { + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + fireEvent.click(saveButton); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for save with empty values", () => { + expect(callForPatchNamespaceMock).toHaveBeenCalledWith( + someNamespace, + [], + ); + }); + + it("shows spinner", () => { + expect( + rendered.getByTestId("saving-edit-resource-from-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + it("save button is disabled", () => { + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).toHaveAttribute("disabled"); + }); + + it("save and close button is disabled", () => { + const saveButton = rendered.getByTestId( + "save-and-close-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).toHaveAttribute("disabled"); + }); + + describe("when saving resolves with success", () => { + beforeEach(async () => { + await callForPatchNamespaceMock.resolve({ + callWasSuccessful: true, + response: { name: "some-name", kind: "Namespace" }, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show spinner anymore", () => { + expect( + rendered.queryByTestId("saving-edit-resource-from-tab-for-some-first-tab-id"), + ).not.toBeInTheDocument(); + }); + + it("save button is enabled", () => { + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).not.toHaveAttribute("disabled"); + }); + + it("save and close button is enabled", () => { + const saveButton = rendered.getByTestId( + "save-and-close-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).not.toHaveAttribute("disabled"); + }); + + it("shows success notification", () => { + expect(showSuccessNotificationMock).toHaveBeenCalled(); + }); + + it("does not show error notification", () => { + expect(showErrorNotificationMock).not.toHaveBeenCalled(); + }); + + it("does not close the dock tab", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + }); + + describe("when saving resolves with failure", () => { + beforeEach(async () => { + await callForPatchNamespaceMock.resolve({ + callWasSuccessful: false, + error: "some-error", + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show spinner anymore", () => { + expect( + rendered.queryByTestId("edit-resource-tab-spinner"), + ).not.toBeInTheDocument(); + }); + + it("save button is enabled", () => { + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).not.toHaveAttribute("disabled"); + }); + + it("save and close button is enabled", () => { + const saveButton = rendered.getByTestId( + "save-and-close-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).not.toHaveAttribute("disabled"); + }); + + it("does not show success notification", () => { + expect(showSuccessNotificationMock).not.toHaveBeenCalled(); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalled(); + }); + + it("does not close the dock tab", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + }); + }); + + describe("when selecting to save and close", () => { + beforeEach(() => { + const saveButton = rendered.getByTestId( + "save-and-close-edit-resource-from-tab-for-some-first-tab-id", + ); + + fireEvent.click(saveButton); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not close the tab yet", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + describe("when saving resolves with success", () => { + beforeEach(async () => { + await callForPatchNamespaceMock.resolve({ + callWasSuccessful: true, + response: { name: "some-name", kind: "Namespace" }, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("closes the dock tab", () => { + expect( + rendered.queryByTestId("dock-tab-for-some-first-tab-id"), + ).not.toBeInTheDocument(); + }); + }); + + describe("when saving resolves with failure", () => { + beforeEach(async () => { + await callForPatchNamespaceMock.resolve({ + callWasSuccessful: false, + error: "Some error", + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + // TODO: Not doable at the moment because info panel controls closing of the tab + xit("does not close the dock tab", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + }); + }); + + describe("when selecting to cancel", () => { + beforeEach(() => { + const cancelButton = rendered.getByTestId( + "cancel-edit-resource-from-tab-for-some-first-tab-id", + ); + + fireEvent.click(cancelButton); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not have dock tab anymore", () => { + expect( + rendered.queryByTestId("dock-tab-for-some-first-tab-id"), + ).not.toBeInTheDocument(); + }); + }); + + describe("given change in configuration", () => { + beforeEach(() => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLInputElement; + + fireEvent.change(input, { + target: { + value: `apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid + somePropertyToBeChanged: some-changed-value + someAddedProperty: some-new-value +`, + }, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("has the changed configuration in editor", () => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLTextAreaElement; + + expect(input.value).toBe(`apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid + somePropertyToBeChanged: some-changed-value + someAddedProperty: some-new-value +`); + }); + + it("stores the changed configuration", async () => { + const readJsonFile = rendererDi.inject( + readJsonFileInjectable, + ); + + const actual = (await readJsonFile( + "/some-directory-for-lens-local-storage/some-cluster-id.json", + )) as any; + + expect( + actual.edit_resource_store["some-first-tab-id"], + ).toEqual({ + resource: "/apis/some-api-version/namespaces/some-uid", + firstDraft: `apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid + somePropertyToBeRemoved: some-value + somePropertyToBeChanged: some-old-value +`, + draft: `apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid + somePropertyToBeChanged: some-changed-value + someAddedProperty: some-new-value +`, + }); + }); + + describe("when selecting to save", () => { + beforeEach(() => { + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + fireEvent.click(saveButton); + }); + + it("calls for save with changed configuration", () => { + expect(callForPatchNamespaceMock).toHaveBeenCalledWith( + someNamespace, + [ + { + op: "remove", + path: "/metadata/somePropertyToBeRemoved", + }, + { + op: "add", + path: "/metadata/someAddedProperty", + value: "some-new-value", + }, + { + op: "replace", + path: "/metadata/somePropertyToBeChanged", + value: "some-changed-value", + }, + ], + ); + }); + + it("given save resolves and another change in configuration, when saving, calls for save with changed configuration", async () => { + await callForPatchNamespaceMock.resolve({ + callWasSuccessful: true, + + response: { + name: "some-name", + kind: "Namespace", + }, + }); + + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLInputElement; + + fireEvent.change(input, { + target: { + value: `apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid + somePropertyToBeChanged: some-changed-value + someAddedProperty: some-new-value + someOtherAddedProperty: some-other-new-value +`, + }, + }); + + + callForPatchNamespaceMock.mockClear(); + + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + fireEvent.click(saveButton); + + expect(callForPatchNamespaceMock).toHaveBeenCalledWith( + someNamespace, + [ + { + op: "add", + path: "/metadata/someOtherAddedProperty", + value: "some-other-new-value", + }, + ], + ); + }); + }); + }); + + describe("given invalid change in configuration", () => { + beforeEach(() => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLInputElement; + + fireEvent.change(input, { + target: { + value: "@some-invalid-configuration@", + }, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("has the changed configuration in editor", () => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLTextAreaElement; + + expect(input.value).toBe(`@some-invalid-configuration@`); + }); + + it("save button is disabled", () => { + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).toHaveAttribute("disabled"); + }); + + it("save and close button is disabled", () => { + const saveButton = rendered.getByTestId( + "save-and-close-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).toHaveAttribute("disabled"); + }); + + describe("when valid change in configuration", () => { + + beforeEach(() => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLInputElement; + + + fireEvent.change(input, { + target: { + value: `apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid +`, + }, + }); + + }); + + it("save button is enabled", () => { + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).not.toHaveAttribute("disabled"); + }); + + it("save and close button is enabled", () => { + const saveButton = rendered.getByTestId( + "save-and-close-edit-resource-from-tab-for-some-first-tab-id", + ); + + expect(saveButton).not.toHaveAttribute("disabled"); + }); + }); + + }); + + describe("given clicking the context menu for second namespace, when clicking to edit namespace", () => { + beforeEach(() => { + callForNamespaceMock.mockClear(); + + // TODO: Make implementation match the description + const namespaceStub = new Namespace(someOtherNamespaceDataStub); + + const createEditResourceTab = rendererDi.inject(createEditResourceTabInjectable); + + createEditResourceTab(namespaceStub); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows dock tab for editing second namespace", () => { + expect( + rendered.getByTestId("dock-tab-content-for-some-second-tab-id"), + ).toBeInTheDocument(); + }); + + it("still has dock tab for first namespace", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + it("shows spinner in the dock tab", () => { + expect( + rendered.getByTestId("edit-resource-tab-spinner"), + ).toBeInTheDocument(); + }); + + it("calls for second namespace", () => { + expect(callForNamespaceMock).toHaveBeenCalledWith( + "/apis/some-api-version/namespaces/some-other-uid", + ); + }); + + describe("when second namespace resolves", () => { + let someOtherNamespace: Namespace; + + beforeEach(async () => { + someOtherNamespace = new Namespace({ + apiVersion: "some-api-version", + kind: "Namespace", + + metadata: { + uid: "some-other-uid", + name: "some-other-name", + resourceVersion: "some-resource-version", + selfLink: + "/apis/some-api-version/namespaces/some-other-uid", + }, + }); + + await callForNamespaceMock.resolve({ + callWasSuccessful: true, + response: someOtherNamespace, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("has the configuration in editor", () => { + const input = rendered.getByTestId( + "monaco-editor-for-some-second-tab-id", + ) as HTMLTextAreaElement; + + expect(input.value).toBe(`apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-other-uid + name: some-other-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-other-uid +`); + }); + + it("when selecting to save, calls for save of second namespace", () => { + callForPatchNamespaceMock.mockClear(); + + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-second-tab-id", + ); + + fireEvent.click(saveButton); + + expect(callForPatchNamespaceMock).toHaveBeenCalledWith( + someOtherNamespace, + [], + ); + }); + + describe("when clicking dock tab for the first namespace", () => { + beforeEach(() => { + callForNamespaceMock.mockClear(); + + const tab = rendered.getByTestId("dock-tab-for-some-first-tab-id"); + + fireEvent.click(tab); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows dock tab for editing first namespace", () => { + expect( + rendered.getByTestId("dock-tab-content-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + it("still has dock tab for second namespace", () => { + expect( + rendered.getByTestId("dock-tab-for-some-second-tab-id"), + ).toBeInTheDocument(); + }); + + it("does not show spinner in the dock tab", () => { + expect( + rendered.queryByTestId("edit-resource-tab-spinner"), + ).not.toBeInTheDocument(); + }); + + it("does not call for namespace", () => { + expect(callForNamespaceMock).not.toHaveBeenCalled(); + }); + + it("has configuration in the editor", () => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLTextAreaElement; + + expect(input.value).toBe(`apiVersion: some-api-version +kind: Namespace +metadata: + uid: some-uid + name: some-name + resourceVersion: some-resource-version + selfLink: /apis/some-api-version/namespaces/some-uid + somePropertyToBeRemoved: some-value + somePropertyToBeChanged: some-old-value +`); + }); + + it("when selecting to save, calls for save of first namespace", () => { + callForPatchNamespaceMock.mockClear(); + + const saveButton = rendered.getByTestId( + "save-edit-resource-from-tab-for-some-first-tab-id", + ); + + fireEvent.click(saveButton); + + expect(callForPatchNamespaceMock).toHaveBeenCalledWith( + someNamespace, + [], + ); + }); + }); + }); + }); + }); + + describe("when call for namespace resolves without namespace", () => { + beforeEach(async () => { + await callForNamespaceMock.resolve({ + callWasSuccessful: true, + response: undefined, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("still shows the dock tab for editing namespace", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + it("shows error message", () => { + expect( + rendered.getByTestId("dock-tab-content-for-some-first-tab-id"), + ).toHaveTextContent("Resource not found"); + }); + + it("does not show error notification", () => { + expect(showErrorNotificationMock).not.toHaveBeenCalled(); + }); + }); + + describe("when call for namespace resolves with failure", () => { + beforeEach(async () => { + await callForNamespaceMock.resolve({ + callWasSuccessful: false, + error: "some-error", + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("still shows the dock tab for editing namespace", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + it("shows error message", () => { + expect( + rendered.getByTestId("dock-tab-content-for-some-first-tab-id"), + ).toHaveTextContent("Resource not found"); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalled(); + }); + }); + }); + }); + }); + }); +}); + +const someNamespaceDataStub = { + apiVersion: "some-api-version", + kind: "Namespace", + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + selfLink: "/apis/some-api-version/namespaces/some-uid", + }, +}; + +const someOtherNamespaceDataStub = { + apiVersion: "some-api-version", + kind: "Namespace", + metadata: { + uid: "some-other-uid", + name: "some-other-name", + resourceVersion: "some-resource-version", + selfLink: "/apis/some-api-version/namespaces/some-other-uid", + }, +}; diff --git a/src/behaviours/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx b/src/behaviours/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx new file mode 100644 index 0000000000..c5e7287988 --- /dev/null +++ b/src/behaviours/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx @@ -0,0 +1,172 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { RenderResult } from "@testing-library/react"; +import { act } from "@testing-library/react"; +import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import React from "react"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; +import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; +import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; +import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable"; +import { controlWhenStoragesAreReady } from "../../../renderer/utils/create-storage/storages-are-ready"; +import writeJsonFileInjectable from "../../../common/fs/write-json-file.injectable"; +import { TabKind } from "../../../renderer/components/dock/dock/store"; +import { Namespace } from "../../../common/k8s-api/endpoints"; + +jest.mock("../../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: + (Target: any) => + ({ tooltip, ...props }: any) => { + if (tooltip) { + const testId = props["data-testid"]; + + return ( + <> + +
+ {tooltip.children || tooltip} +
+ + ); + } + + return ; + }, +})); + +describe("cluster/namespaces - edit namespaces from previously opened tab", () => { + let builder: ApplicationBuilder; + let callForNamespaceMock: AsyncFnMock; + let storagesAreReady: () => Promise; + + beforeEach(() => { + builder = getApplicationBuilder(); + + builder.setEnvironmentToClusterFrame(); + + callForNamespaceMock = asyncFn(); + + builder.beforeApplicationStart(({ rendererDi }) => { + rendererDi.override( + directoryForLensLocalStorageInjectable, + () => "/some-directory-for-lens-local-storage", + ); + + rendererDi.override(hostedClusterIdInjectable, () => "some-cluster-id"); + + storagesAreReady = controlWhenStoragesAreReady(rendererDi); + + rendererDi.override(callForResourceInjectable, () => callForNamespaceMock); + }); + + builder.allowKubeResource("namespaces"); + }); + + describe("given tab was previously opened, when application is started", () => { + let rendered: RenderResult; + + beforeEach(async () => { + const writeJsonFile = builder.dis.rendererDi.inject(writeJsonFileInjectable); + + await writeJsonFile( + "/some-directory-for-lens-local-storage/some-cluster-id.json", + { + dock: { + height: 300, + tabs: [ + { + id: "some-first-tab-id", + kind: TabKind.EDIT_RESOURCE, + title: "Namespace: some-namespace", + pinned: false, + }, + ], + + isOpen: true, + }, + + edit_resource_store: { + "some-first-tab-id": { + resource: "/apis/some-api-version/namespaces/some-uid", + draft: "some-saved-configuration", + }, + }, + }, + ); + + rendered = await builder.render(); + + await storagesAreReady(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows dock tab for editing namespace", () => { + expect( + rendered.getByTestId("dock-tab-for-some-first-tab-id"), + ).toBeInTheDocument(); + }); + + it("shows spinner in the dock tab", () => { + expect( + rendered.getByTestId("edit-resource-tab-spinner"), + ).toBeInTheDocument(); + }); + + it("calls for namespace", () => { + expect(callForNamespaceMock).toHaveBeenCalledWith( + "/apis/some-api-version/namespaces/some-uid", + ); + }); + + describe("when call for namespace resolves with namespace", () => { + let someNamespace: Namespace; + + beforeEach(async () => { + someNamespace = new Namespace({ + apiVersion: "some-api-version", + kind: "Namespace", + + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + selfLink: "/apis/some-api-version/namespaces/some-uid", + somePropertyToBeRemoved: "some-value", + somePropertyToBeChanged: "some-old-value", + }, + }); + + // TODO: Figure out why act is needed here. In CI it works without it. + await act(async () => { + await callForNamespaceMock.resolve({ + callWasSuccessful: true, + response: someNamespace, + }); + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("has the saved configuration in editor", () => { + const input = rendered.getByTestId( + "monaco-editor-for-some-first-tab-id", + ) as HTMLTextAreaElement; + + expect(input.value).toBe("some-saved-configuration"); + }); + }); + }); +}); diff --git a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap index eb02f57fc8..745c657614 100644 --- a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap +++ b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap @@ -2644,10 +2644,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
@@ -3651,10 +3652,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n class="Spinner singleColor center" data-testid="install-chart-configuration-spinner" /> - + > + some-default-configuration +
@@ -4624,10 +4626,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration-for-other-version +
@@ -5597,10 +5600,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
@@ -6590,10 +6594,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + @some-invalid-configuration@ +
@@ -7565,10 +7570,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
@@ -8567,10 +8573,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
@@ -9548,10 +9555,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
@@ -13030,10 +13038,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
@@ -15102,10 +15111,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-other-default-configuration +
@@ -16122,10 +16132,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
@@ -17095,10 +17106,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-valid-configuration +
@@ -18068,10 +18080,11 @@ exports[`installing helm chart from new tab given tab for installing chart was n Install
- + > + some-default-configuration +
diff --git a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap index b0e67015f3..8c5475a888 100644 --- a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap +++ b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap @@ -1243,10 +1243,11 @@ exports[`installing helm chart from previously opened tab given tab for installi Install
- + > + some-stored-configuration +
diff --git a/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap index 3c36512476..ba191595b2 100644 --- a/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap +++ b/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap @@ -7336,10 +7336,11 @@ exports[`showing details for helm release given application is started when navi User-supplied values only - + > + some-configuration +
); - } -} + }, +); -export const EditResource = withInjectables(NonInjectedEditResource, { - getProps: (di, props) => ({ - editResourceStore: di.inject(editResourceTabStoreInjectable), - closeTab: di.inject(closeDockTabInjectable), - ...props, - }), -}); +export const EditResource = withInjectables( + NonInjectedEditResource, + { + getPlaceholder: () => ( + + ), + + getProps: async (di, props) => ({ + model: await di.inject(editResourceModelInjectable, props.tab.id), + ...props, + }), + }, +); diff --git a/src/renderer/components/dock/info-panel.tsx b/src/renderer/components/dock/info-panel.tsx index 22ecea94ec..48a53a0308 100644 --- a/src/renderer/components/dock/info-panel.tsx +++ b/src/renderer/components/dock/info-panel.tsx @@ -39,6 +39,7 @@ export interface OptionalProps { showNotifications?: boolean; showStatusPanel?: boolean; submitTestId?: string; + submitAndCloseTestId?: string; cancelTestId?: string; submittingTestId?: string; } @@ -167,6 +168,7 @@ class NonInjectedInfoPanel extends Component { label={`${submitLabel} & Close`} onClick={submitAndClose} disabled={isDisabled} + data-testid={this.props.submitAndCloseTestId} /> )} diff --git a/src/renderer/components/monaco-editor/__mocks__/monaco-editor.tsx b/src/renderer/components/monaco-editor/__mocks__/monaco-editor.tsx index e7b01cc876..23524a476b 100644 --- a/src/renderer/components/monaco-editor/__mocks__/monaco-editor.tsx +++ b/src/renderer/components/monaco-editor/__mocks__/monaco-editor.tsx @@ -12,7 +12,7 @@ class FakeMonacoEditor extends React.Component { const { id, value, onChange, onError, language = "yaml" } = this.props; return ( - { diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 995e1cb54e..da07584816 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -5,7 +5,7 @@ import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable"; -import type { IObservableArray, ObservableSet } from "mobx"; +import type { ObservableSet } from "mobx"; import { computed, observable, runInAction } from "mobx"; import React from "react"; import { Router } from "react-router"; @@ -36,7 +36,6 @@ import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-f import startMainApplicationInjectable from "../../../main/start-main-application/start-main-application.injectable"; import startFrameInjectable from "../../start-frame/start-frame.injectable"; import type { NamespaceStore } from "../+namespaces/store"; -import namespaceStoreInjectable from "../+namespaces/store.injectable"; import historyInjectable from "../../navigation/history.injectable"; import type { MinimalTrayMenuItem } from "../../../main/tray/electron-tray/electron-tray.injectable"; import electronTrayInjectable from "../../../main/tray/electron-tray/electron-tray.injectable"; @@ -61,6 +60,8 @@ import { ClusterFrame } from "../../frames/cluster-frame/cluster-frame"; import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable"; import activeKubernetesClusterInjectable from "../../cluster-frame-context/active-kubernetes-cluster.injectable"; import { catalogEntityFromCluster } from "../../../main/cluster-manager"; +import namespaceStoreInjectable from "../+namespaces/store.injectable"; +import { isAllowedResource } from "../../../common/cluster/is-allowed-resource"; type Callback = (dis: DiContainers) => void | Promise; @@ -208,7 +209,7 @@ export const getApplicationBuilder = () => { }, })); - let allowedResourcesState: IObservableArray; + let allowedResourcesState: KubeResource[]; let rendered: RenderResult; const enableExtensionsFor = ( @@ -398,16 +399,27 @@ export const getApplicationBuilder = () => { const clusterStub = { accessibleNamespaces: [], + isAllowedResource: isAllowedResource(allowedResourcesState), } as unknown as Cluster; rendererDi.override(activeKubernetesClusterInjectable, () => computed(() => catalogEntityFromCluster(clusterStub)), ); + // TODO: Figure out a way to remove this stub. const namespaceStoreStub = { + isLoaded: true, contextNamespaces: [], + contextItems: [], + api: { + kind: "Namespace", + }, items: [], selectNamespaces: () => {}, + getByPath: () => undefined, + pickOnlySelected: () => [], + isSelectedAll: () => false, + getTotalCount: () => 0, } as unknown as NamespaceStore; const clusterFrameContextFake = new ClusterFrameContext( diff --git a/src/renderer/utils/create-storage/storages-are-ready.ts b/src/renderer/utils/create-storage/storages-are-ready.ts index 641c64cf8b..04f2595472 100644 --- a/src/renderer/utils/create-storage/storages-are-ready.ts +++ b/src/renderer/utils/create-storage/storages-are-ready.ts @@ -22,5 +22,7 @@ export const controlWhenStoragesAreReady = (di: DiContainer) => { // TODO: Remove when typing is added to the library (di as any).decorateFunction(createStorageInjectable, decorated); - return async () => void await Promise.all(storagesAreReady); + return async () => { + await Promise.all(storagesAreReady); + }; };