update archived condition for getPlanPhase & getPlanSummaryStatus

Signed-off-by: Jeff Puzzo <[email protected]>

Author: jpuzz0

packages/forklift-console-plugin/src/modules/Plans/utils/constants/planPhases.ts

@@ -12,7 +12,6 @@ export const planPhases: { id: PlanPhase; label: string }[] = [
   { id: PlanPhase.Error, label: PlanPhase.Error },
   { id: PlanPhase.vmError, label: PlanPhase.vmError },
   { id: PlanPhase.Unknown, label: PlanPhase.Unknown },
-  { id: PlanPhase.Archiving, label: PlanPhase.Archiving },
   { id: PlanPhase.Archived, label: PlanPhase.Archived },
   { id: PlanPhase.Failed, label: PlanPhase.Failed },
   { id: PlanPhase.Canceled, label: PlanPhase.Canceled },

packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanPhase.ts

@@ -18,11 +18,7 @@ export const getPlanPhase = (data: PlanData): PlanPhase => {
   }
 
   // Check for Archived
-  if (plan?.spec?.archived && !conditionTypes[PlanConditionType.Archived]) {
-    return PlanPhase.Archiving;
-  }
-
-  if (conditionTypes[PlanConditionType.Archived]) {
+  if (plan?.spec?.archived || conditionTypes[PlanConditionType.Archived]) {
     return PlanPhase.Archived;
   }
 
@@ -123,5 +119,5 @@ export const isPlanEditable = (plan: V1beta1Plan) => {
 export const isPlanArchived = (plan: V1beta1Plan) => {
   const planStatus = getPlanPhase({ obj: plan });
 
-  return planStatus === PlanPhase.Archiving || planStatus === PlanPhase.Archived;
+  return planStatus === PlanPhase.Archived;
 };

packages/forklift-console-plugin/src/modules/Plans/utils/helpers/getPlanSummaryStatus.ts

@@ -26,7 +26,7 @@ export const getPlanSummaryStatus = (data: PlanData): PlanSummaryStatus => {
   } = conditionTypes;
 
   // Archived
-  if ((plan?.spec?.archived && !isArchived) || isArchived) {
+  if (plan?.spec?.archived || isArchived) {
     return PlanSummaryStatus.Archived;
   }