hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

fix: app-crash on editing k8s resource

Browse Source 
Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2021-05-10 20:26:13 +03:00
parent ed1f88b5d8
commit 5c67bb7ae2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderer/components/dock/edit-resource.tsx
View File

@ -1,7 +1,7 @@
import "./edit-resource.scss"; import "./edit-resource.scss";
import React from "react"; import React from "react";
import { action, computed, observable, makeObservable } from "mobx"; import { action, computed, makeObservable, observable } from "mobx";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import jsYaml from "js-yaml"; import jsYaml from "js-yaml";
import { IDockTab } from "./dock.store"; import { IDockTab } from "./dock.store";
@ -31,7 +31,7 @@ export class EditResource extends React.Component<Props> {
return this.props.tab.id; return this.props.tab.id;
} }
get isReady() { get isReadyForEditing() {
return editResourceStore.isReady(this.tabId); return editResourceStore.isReady(this.tabId);
} }
@ -40,7 +40,7 @@ export class EditResource extends React.Component<Props> {
} }
@computed get draft(): string { @computed get draft(): string {
if (!this.isReady) { if (!this.isReadyForEditing) {
return ""; // wait until tab's data and kube-object resource are loaded return ""; // wait until tab's data and kube-object resource are loaded
} }
@ -50,13 +50,13 @@ export class EditResource extends React.Component<Props> {
return draft; return draft;
} }
return jsYaml.dump(this.resource); // dump resource first time return jsYaml.safeDump(this.resource.toPlainObject()); // dump resource first time
} }
@action @action
saveDraft(draft: string | KubeObject) { saveDraft(draft: string | object) {
if (typeof draft === "object") { if (typeof draft === "object") {
draft = draft ? jsYaml.dump(draft) : undefined; draft = draft ? jsYaml.safeDump(draft) : undefined;
} }
editResourceStore.setData(this.tabId, { editResourceStore.setData(this.tabId, {
@ -75,9 +75,9 @@ export class EditResource extends React.Component<Props> {
return; return;
} }
const store = editResourceStore.getStore(this.tabId); const store = editResourceStore.getStore(this.tabId);
const updatedResource = await store.update(this.resource, jsYaml.safeLoad(this.draft)); const updatedResource: KubeObject = await store.update(this.resource, jsYaml.safeLoad(this.draft));
this.saveDraft(updatedResource); // update with new resourceVersion to avoid further errors on save this.saveDraft(updatedResource.toPlainObject()); // update with new resourceVersion to avoid further errors on save
const resourceType = updatedResource.kind; const resourceType = updatedResource.kind;
const resourceName = updatedResource.getName(); const resourceName = updatedResource.getName();
@ -89,9 +89,9 @@ export class EditResource extends React.Component<Props> {
}; };
render() { render() {
const { tabId, error, onChange, save, draft, isReady, resource } = this; const { tabId, error, onChange, save, draft, isReadyForEditing, resource } = this;
if (!isReady) { if (!isReadyForEditing) {
return <Spinner center/>; return <Spinner center/>;
} }