refactor: rename function

weaveworks · Apr 27, 2022 · 70ef47a · 70ef47a
1 parent 6194b25
commit 70ef47a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/views/nodes/sourceNode.ts b/src/views/nodes/sourceNode.ts
@@ -38,7 +38,7 @@ export class SourceNode extends TreeNode {
 		let revisionOrError = '';
 
 		if (this.isReconcileFailed) {
-			revisionOrError = `${this.findReadyCondition(this.resource.status.conditions)?.reason}`;
+			revisionOrError = `${this.findReadyOrFirstCondition(this.resource.status.conditions)?.reason}`;
 		} else {
 			revisionOrError = shortenRevision(this.resource.status.artifact?.revision);
 		}
@@ -56,7 +56,7 @@ export class SourceNode extends TreeNode {
 
 		// show status in hover when source fetching failed
 		if (this.isReconcileFailed) {
-			const readyCondition = this.findReadyCondition(source.status.conditions);
+			const readyCondition = this.findReadyOrFirstCondition(source.status.conditions);
 			createMarkdownHr(markdown);
 			createMarkdownError('Status message', readyCondition?.message, markdown);
 			createMarkdownError('Status reason', readyCondition?.reason, markdown);
@@ -71,7 +71,7 @@ export class SourceNode extends TreeNode {
 	 *
 	 * @param conditions "status.conditions" of the source
 	 */
-	findReadyCondition(conditions?: DeploymentCondition[]): DeploymentCondition | undefined {
+	findReadyOrFirstCondition(conditions?: DeploymentCondition[]): DeploymentCondition | undefined {
 		return conditions?.find(condition => condition.type === 'Ready') || conditions?.[0];
 	}
 
@@ -80,7 +80,7 @@ export class SourceNode extends TreeNode {
 	 * @param source target source
 	 */
 	updateStatus(source: GitRepository | HelmRepository | Bucket): void {
-		if (this.findReadyCondition(source.status.conditions)?.status === 'True') {
+		if (this.findReadyOrFirstCondition(source.status.conditions)?.status === 'True') {
 			this.setIcon(TreeNodeIcon.Success);
 			this.isReconcileFailed = false;
 		} else {

diff --git a/src/views/nodes/workloadNode.ts b/src/views/nodes/workloadNode.ts
@@ -31,7 +31,7 @@ export class WorkloadNode extends TreeNode {
 	 *
 	 * @param conditions "status.conditions" of the workload
 	 */
-	findReadyCondition(conditions?: DeploymentCondition | DeploymentCondition[]): DeploymentCondition | undefined {
+	findReadyOrFirstCondition(conditions?: DeploymentCondition | DeploymentCondition[]): DeploymentCondition | undefined {
 		if (Array.isArray(conditions)) {
 			return conditions.find(condition => condition.type === 'Ready') || conditions[0];
 		} else {
@@ -44,7 +44,7 @@ export class WorkloadNode extends TreeNode {
 	 * @param workload target resource
 	 */
 	updateStatus(workload: Kustomize | HelmRelease): void {
-		const condition = this.findReadyCondition(workload.status.conditions);
+		const condition = this.findReadyOrFirstCondition(workload.status.conditions);
 
 		if (condition?.status === 'True') {
 			this.isReconcileFailed = false;
@@ -75,7 +75,7 @@ export class WorkloadNode extends TreeNode {
 
 		// show status in hover when source fetching failed
 		if (this.isReconcileFailed) {
-			const readyCondition = this.findReadyCondition(workload.status.conditions);
+			const readyCondition = this.findReadyOrFirstCondition(workload.status.conditions);
 			createMarkdownHr(markdown);
 			createMarkdownError('Status message', readyCondition?.message, markdown);
 			createMarkdownError('Status reason', readyCondition?.reason, markdown);