diff --git a/client/src/app/components/environments/deployment-state-tag/deployment-state-tag.component.ts b/client/src/app/components/environments/deployment-state-tag/deployment-state-tag.component.ts index 14cf1f31..30b95a90 100644 --- a/client/src/app/components/environments/deployment-state-tag/deployment-state-tag.component.ts +++ b/client/src/app/components/environments/deployment-state-tag/deployment-state-tag.component.ts @@ -50,13 +50,13 @@ export class DeploymentStateTagComponent { INACTIVE: 'time-duration-off', UNKNOWN: 'question-mark', NEVER_DEPLOYED: 'question-mark', - REPLACED: 'progress', + REPLACED: 'repeat', }; return iconMap[this.internalState()]; }); iconClass = computed(() => { - const spinStates: ExtendedDeploymentState[] = ['WAITING', 'PENDING', 'IN_PROGRESS', 'QUEUED', 'REPLACED']; + const spinStates: ExtendedDeploymentState[] = ['WAITING', 'PENDING', 'IN_PROGRESS', 'QUEUED']; return `!size-5 ${spinStates.includes(this.internalState()) ? 'animate-spin' : ''}`; }); diff --git a/client/src/app/components/release-candidate-deployment-table/release-candidate-deployment-table.component.ts b/client/src/app/components/release-candidate-deployment-table/release-candidate-deployment-table.component.ts index 3d5ab06d..0b429aa5 100644 --- a/client/src/app/components/release-candidate-deployment-table/release-candidate-deployment-table.component.ts +++ b/client/src/app/components/release-candidate-deployment-table/release-candidate-deployment-table.component.ts @@ -90,12 +90,10 @@ export class ReleaseCandidateDeploymentTableComponent { } // If the latest deployment is not part of the deployments list, but there were deployments to this environment, the release candidate was replaced - if (deployments.every(deployment => environment.latestDeployment?.id !== deployment.id && environment.latestDeployment?.type !== deployment.type)) { + if (deployments.every(deployment => environment.latestDeployment?.id !== deployment.id || environment.latestDeployment?.type !== deployment.type)) { return 'REPLACED'; } - console.log(deployments); - // If we were not replaced and we are deployed, we are the latest deployment return environment.latestDeployment?.state || 'UNKNOWN'; };