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 not being able to clear set cluster icon (#4555)

Browse Source
This commit is contained in:
Sebastian Malton 2021-12-14 11:38:31 -05:00 committed by GitHub
parent 56e72b3a74
commit d775d53078
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/cluster-types.ts
View File

@ -90,7 +90,11 @@ export interface ClusterPreferences extends ClusterPrometheusPreferences {
terminalCWD?: string; terminalCWD?: string;
clusterName?: string; clusterName?: string;
iconOrder?: number; iconOrder?: number;
icon?: string; /**
* The <img> src for the cluster. If set to `null` that means that it was
* cleared by preferences.
*/
icon?: string | null;
httpsProxy?: string; httpsProxy?: string;
hiddenMetrics?: string[]; hiddenMetrics?: string[];
nodeShellImage?: string; nodeShellImage?: string;

12
src/main/cluster-manager.ts
View File

@ -136,11 +136,16 @@ export class ClusterManager extends Singleton {
entity.spec.metrics.prometheus = prometheus; entity.spec.metrics.prometheus = prometheus;
} }
// Only set the icon if the preference is set. If the preference is not set
// then let the source determine if a cluster has an icon.
if (cluster.preferences.icon) { if (cluster.preferences.icon) {
entity.spec.icon ??= {}; entity.spec.icon ??= {};
entity.spec.icon.src = cluster.preferences.icon; entity.spec.icon.src = cluster.preferences.icon;
} else if (cluster.preferences.icon === null) {
/**
* NOTE: only clear the icon if set to `null` by ClusterIconSettings.
* We can then also clear that value too
*/
entity.spec.icon = undefined;
cluster.preferences.icon = undefined;
} }
catalogEntityRegistry.items.splice(index, 1, entity); catalogEntityRegistry.items.splice(index, 1, entity);
@ -177,7 +182,8 @@ export class ClusterManager extends Singleton {
} }
} }
@action syncClustersFromCatalog(entities: KubernetesCluster[]) { @action
protected syncClustersFromCatalog(entities: KubernetesCluster[]) {
for (const entity of entities) { for (const entity of entities) {
const cluster = this.store.getById(entity.metadata.uid); const cluster = this.store.getById(entity.metadata.uid);

6
src/renderer/components/cluster-settings/components/cluster-icon-settings.tsx
View File

@ -65,7 +65,11 @@ export class ClusterIconSetting extends React.Component<Props> {
} }
clearIcon() { clearIcon() {
this.props.cluster.preferences.icon = undefined; /**
* NOTE: this needs to be `null` rather than `undefined` so that we can
* tell the difference between it not being there and being cleared.
*/
this.props.cluster.preferences.icon = null;
} }
@boundMethod @boundMethod