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 bugs

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2021-05-18 13:10:47 +03:00
parent acf03da3af
commit 584f0622ca
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/metrics-cluster-feature/src/metrics-settings.tsx
View File

@ -174,11 +174,14 @@ export class MetricsSettings extends React.Component<Props> {
} }
@computed get buttonLabel() { @computed get buttonLabel() {
const allDisabled = !this.featureStates.kubeStateMetrics && !this.featureStates.nodeExporter && !this.featureStates.prometheus;
if (this.inProgress && this.canUpgrade) return "Upgrading ..."; if (this.inProgress && this.canUpgrade) return "Upgrading ...";
if (this.inProgress && allDisabled) return "Uninstalling ...";
if (this.inProgress) return "Applying ..."; if (this.inProgress) return "Applying ...";
if (this.canUpgrade) return "Upgrade"; if (this.canUpgrade) return "Upgrade";
if (this.changed && !this.featureStates.kubeStateMetrics && !this.featureStates.nodeExporter && !this.featureStates.prometheus) { if (this.changed && allDisabled) {
return "Uninstall"; return "Uninstall";
} }

2
src/common/k8s/resource-stack.ts
View File

@ -131,7 +131,7 @@ export class ResourceStack {
resourceData = raw.toString(); resourceData = raw.toString();
} }
if (!resourceData.trim()) return; if (!resourceData.trim()) continue;
const resourceArray = yaml.safeLoadAll(resourceData.toString()); const resourceArray = yaml.safeLoadAll(resourceData.toString());

6
src/renderer/components/+entity-settings/entity-settings.tsx
View File

@ -83,9 +83,9 @@ export class EntitySettings extends React.Component<Props> {
{ groups.map((group) => ( { groups.map((group) => (
<> <>
<div className="header">{group[0]}</div> <div className="header">{group[0]}</div>
{ group[1].map((setting) => ( { group[1].map((setting, index) => (
<Tab <Tab
key={setting.id} key={index}
value={setting.id} value={setting.id}
label={setting.title} label={setting.title}
data-testid={`${setting.id}-tab`} data-testid={`${setting.id}-tab`}
@ -124,7 +124,7 @@ export class EntitySettings extends React.Component<Props> {
<section> <section>
<h2 data-testid={`${activeSetting.id}-header`}>{activeSetting.title}</h2> <h2 data-testid={`${activeSetting.id}-header`}>{activeSetting.title}</h2>
<section> <section>
<activeSetting.components.View entity={this.entity} /> <activeSetting.components.View entity={this.entity} key={activeSetting.title} />
</section> </section>
</section> </section>
</PageLayout> </PageLayout>