Adding 'Previous Role' to the reconfiguration text

src/SfxWeb/cypress/e2e/deployedReplica.cy.js

@@ -81,6 +81,13 @@ context('deployed replica', () => {
             checkCommand(1);
 
         })
+
+        it('reconfiguration text', () => {
+          cy.intercept(apiUrl(`/Partitions/${partition}?*`), { fixture: 'deployed-replica/partition-reconfiguration.json' }).as('partition-reconfig');
+          cy.intercept(apiUrl(`/Nodes/${nodeName}/$/GetApplications/${appName}/$/GetReplicas?*`), { fixture: 'deployed-replica/view-replica-reconfiguration.json' }).as('replica-reconfig');
+
+          cy.get('[data-cy="tree-panel"]').contains('Reconfiguring: ActiveSecondary ➜ Primary');
+        })
     })
   })
 

src/SfxWeb/cypress/e2e/replica.cy.js

@@ -133,6 +133,14 @@ context('replica', () => {
             });
 
         })
+
+        it('view reconfiguration text', () => {
+            addRoute("partitionInfo", "replica-page/stateful-partition-reconfiguration-info.json", apiUrl(`${baseUrl}?*`))
+            addRoute("replicaInfo", "replica-page/stateful-replica-reconfiguration.json", apiUrl(`${baseUrl}/$/GetReplicas/${replicaId}?*`))
+            cy.wait(waitRequest)
+
+            cy.get('[data-cy="tree-panel"]').contains('Reconfiguring: ActiveSecondary ➜ Primary');
+        })
     })
 
     describe("stateless", () => {

src/SfxWeb/cypress/fixtures/deployed-replica/partition-reconfiguration.json

@@ -0,0 +1,18 @@
+{
+    "ServiceKind": "Stateful",
+    "PartitionInformation": {
+        "ServicePartitionKind": "Int64Range",
+        "Id": "41fb6918-986b-4b6d-bff6-0495b114c720",
+        "LowKey": "2",
+        "HighKey": "1844674407370955163"
+    },
+    "TargetReplicaSetSize": 3,
+    "MinReplicaSetSize": 2,
+    "HealthState": "Ok",
+    "PartitionStatus": "Reconfiguring",
+    "LastQuorumLossDurationInSeconds": "0",
+    "CurrentConfigurationEpoch": {
+        "ConfigurationVersion": "94489280512",
+        "DataLossVersion": "132399270145364138"
+    }
+}

src/SfxWeb/cypress/fixtures/deployed-replica/view-replica-reconfiguration.json

@@ -0,0 +1,23 @@
+[
+    {
+        "ServiceKind": "Stateful",
+        "ServiceName": "fabric:/VisualObjectsApplicationType/VisualObjects.ActorService",
+        "ServiceTypeName": "VisualObjects.ActorServiceType",
+        "ServiceManifestVersion": "",
+        "ServiceManifestName": "VisualObjects.ActorServicePkg",
+        "CodePackageName": "Code",
+        "PartitionId": "41fb6918-986b-4b6d-bff6-0495b114c720",
+        "ReplicaId": "132431356665040624",
+        "ReplicaRole": "Primary",
+        "ReplicaStatus": "Ready",
+        "Address": "{\"Endpoints\":{\"\":\"10.0.0.6:20000+41fb6918-986b-4b6d-bff6-0495b114c720-132431356665040624\"}}",
+        "ServicePackageActivationId": "",
+        "HostProcessId": "4120",
+        "ReconfigurationInformation": {
+            "PreviousConfigurationRole": "ActiveSecondary",
+            "ReconfigurationPhase": "None",
+            "ReconfigurationType": "None",
+            "ReconfigurationStartTimeUtc": "0001-01-01T00:00:00.000Z"
+        }
+    }
+]

src/SfxWeb/cypress/fixtures/partition-page/replicas.json

@@ -5,6 +5,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132422367823912071",
             "ReplicaRole": "ActiveSecondary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Ok",
             "Address": "",
@@ -15,6 +16,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132429154475414363",
             "ReplicaRole": "Primary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Warning",
             "Address": "{\"Endpoints\":{\"\":\"10.0.0.5:20001+28bfaf73-37b0-467d-9d47-d011b0aedbc0-132429154475414363\"}}",
@@ -25,6 +27,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132431356665040624",
             "ReplicaRole": "ActiveSecondary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Error",
             "Address": "",

src/SfxWeb/cypress/fixtures/replica-page/stateful-idle-secondary-replica-info.json

@@ -2,6 +2,7 @@
     "ServiceKind": "Stateful",
     "ReplicaId": "132429154475414363",
     "ReplicaRole": "IdleSecondary",
+    "PreviousReplicaRole": "None",
     "ReplicaStatus": "Ready",
     "HealthState": "Ok",
     "Address": "{\"Endpoints\":{\"\":\"10.0.0.5:20001+28bfaf73-37b0-467d-9d47-d011b0aedbc0-132429154475414363\"}}",

src/SfxWeb/cypress/fixtures/replica-page/stateful-partition-reconfiguration-info.json

@@ -0,0 +1,18 @@
+{
+    "ServiceKind": "Stateful",
+    "PartitionInformation": {
+        "ServicePartitionKind": "Int64Range",
+        "Id": "28bfaf73-37b0-467d-9d47-d011b0aedbc0",
+        "LowKey": "-9223372036854775808",
+        "HighKey": "-7378697629483820647"
+    },
+    "TargetReplicaSetSize": 3,
+    "MinReplicaSetSize": 2,
+    "HealthState": "Ok",
+    "PartitionStatus": "Reconfiguring",
+    "LastQuorumLossDurationInSeconds": "0",
+    "CurrentConfigurationEpoch": {
+        "ConfigurationVersion": "85899345920",
+        "DataLossVersion": "132399270145364138"
+    }
+}

src/SfxWeb/cypress/fixtures/replica-page/stateful-replica-info.json

@@ -2,6 +2,7 @@
   "ServiceKind": "Stateful",
   "ReplicaId": "132429154475414363",
   "ReplicaRole": "Primary",
+  "PreviousReplicaRole": "None",
   "ReplicaStatus": "Ready",
   "HealthState": "Ok",
   "Address": "{\"Endpoints\":{\"\":\"10.0.0.5:20001+28bfaf73-37b0-467d-9d47-d011b0aedbc0-132429154475414363\"}}",

src/SfxWeb/cypress/fixtures/replica-page/stateful-replica-reconfiguration.json

@@ -0,0 +1,11 @@
+{
+    "ServiceKind": "Stateful",
+    "ReplicaId": "132429154475414363",
+    "ReplicaRole": "Primary",
+    "PreviousReplicaRole": "ActiveSecondary",
+    "ReplicaStatus": "Ready",
+    "HealthState": "Ok",
+    "Address": "{\"Endpoints\":{\"\":\"10.0.0.5:20001+28bfaf73-37b0-467d-9d47-d011b0aedbc0-132429154475414363\"}}",
+    "NodeName": "_nt_1",
+    "LastInBuildDurationInSeconds": "8"
+}

src/SfxWeb/cypress/fixtures/replica-page/stateful-replicas-list.json

@@ -5,6 +5,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132422367823912071",
             "ReplicaRole": "ActiveSecondary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Ok",
             "Address": "",
@@ -15,6 +16,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132429154475414363",
             "ReplicaRole": "Primary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Ok",
             "Address": "{\"Endpoints\":{\"\":\"10.0.0.5:20001+28bfaf73-37b0-467d-9d47-d011b0aedbc0-132429154475414363\"}}",
@@ -25,6 +27,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132431356665040624",
             "ReplicaRole": "ActiveSecondary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Ok",
             "Address": "",

src/SfxWeb/cypress/fixtures/xss/replica-page/stateful-replica-info.json

@@ -2,6 +2,7 @@
     "ServiceKind": "Stateful",
     "ReplicaId": "132429154475414363",
     "ReplicaRole": "Primary",
+    "PreviousReplicaRole": "None",
     "ReplicaStatus": "Ready",
     "HealthState": "Ok",
     "Address": "{\"Endpoints\":{\"\":\"10.0.0.5:20001+<img src='1' onerror='window.alert(document.domain)'>-132429154475414363\"}}",

src/SfxWeb/cypress/fixtures/xss/replica-page/stateful-replicas-list.json

@@ -5,6 +5,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132422367823912071",
             "ReplicaRole": "ActiveSecondary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Ok",
             "Address": "",
@@ -15,6 +16,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132429154475414363",
             "ReplicaRole": "Primary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Ok",
             "Address": "{\"Endpoints\":{\"\":\"10.0.0.5:20001+28bfaf73-37b0-467d-9d47-d011b0aedbc0-132429154475414363\"}}",
@@ -25,6 +27,7 @@
             "ServiceKind": "Stateful",
             "ReplicaId": "132431356665040624",
             "ReplicaRole": "ActiveSecondary",
+            "PreviousReplicaRole": "None",
             "ReplicaStatus": "Ready",
             "HealthState": "Ok",
             "Address": "",

src/SfxWeb/src/app/Common/Constants.ts

@@ -248,6 +248,10 @@ export class RepairTaskMessages {
   }
 }
 
+export class UnicodeConstants {
+    public static RightArrow = '\u279c';
+}
+
 export interface IPregeneratedColor {
   color: string,
   hex: string

src/SfxWeb/src/app/Models/DataModels/DeployedReplica.ts

@@ -3,7 +3,7 @@ import { IRawDeployedReplica, IRawPartition, IRawDeployedReplicaDetail, IRawLoad
 import { DataService } from 'src/app/services/data.service';
 import { DeployedServicePackage } from './DeployedServicePackage';
 import { IdUtils } from 'src/app/Utils/IdUtils';
-import { ServiceKindRegexes, SortPriorities } from 'src/app/Common/Constants';
+import { ServiceKindRegexes, SortPriorities, UnicodeConstants } from 'src/app/Common/Constants';
 import { TimeUtils } from 'src/app/Utils/TimeUtils';
 import { IResponseMessageHandler, ResponseMessageHandlers } from 'src/app/Common/ResponseMessageHandlers';
 import { HtmlUtils } from 'src/app/Utils/HtmlUtils';
@@ -73,11 +73,18 @@ export class DeployedReplica extends DataModelBase<IRawDeployedReplica> {
     }
 
     public get role(): string {
-        if (this.partition && this.partition.PartitionStatus === 'Reconfiguring') {
-            return `Reconfiguring - Target Role: ${this.raw.ReplicaRole}`;
-        }
+        const { ReconfigurationInformation, ReplicaRole } = this.raw;
 
-        return this.raw.ReplicaRole;
+        if (!this.partition || this.partition.PartitionStatus !== 'Reconfiguring') {
+            return ReplicaRole;
+        }
+
+        const PreviousReplicaRole = ReconfigurationInformation.PreviousConfigurationRole;
+        if (!PreviousReplicaRole || PreviousReplicaRole === 'None') {
+            return `Reconfiguring - Target Role: ${ReplicaRole}`;
+        }
+
+        return `Reconfiguring: ${PreviousReplicaRole} ${UnicodeConstants.RightArrow} ${ReplicaRole}`;
     }
 
     public get viewPath(): string {

src/SfxWeb/src/app/Models/DataModels/Replica.ts

@@ -5,7 +5,7 @@ import { DeployedReplicaDetail } from './DeployedReplica';
 import { DataService } from 'src/app/services/data.service';
 import { Partition } from './Partition';
 import { HealthStateFilterFlags } from '../HealthChunkRawDataTypes';
-import { ServiceKindRegexes, SortPriorities } from 'src/app/Common/Constants';
+import { ServiceKindRegexes, SortPriorities, UnicodeConstants } from 'src/app/Common/Constants';
 import { TimeUtils } from 'src/app/Utils/TimeUtils';
 import { IResponseMessageHandler } from 'src/app/Common/ResponseMessageHandlers';
 import { HealthBase } from './HealthEvent';
@@ -27,7 +27,7 @@ export class ReplicaOnPartition extends DataModelBase<IRawReplicaOnPartition> {
                 displayValue: (value) => this.lastInBuildDuration
             },
             ReplicaRole: {
-              displayValue: (value) => this.role
+                displayValue: (value) => this.role
             }
         }
     };
@@ -73,13 +73,32 @@ export class ReplicaOnPartition extends DataModelBase<IRawReplicaOnPartition> {
     }
 
     public get role(): string {
-        if (this.parent.raw.PartitionStatus === 'Reconfiguring') {
-            return `Reconfiguring - Target Role: ${this.raw.ReplicaRole}`;
+        const { PartitionStatus } = this.parent.raw;
+        const { PreviousReplicaRole, ReplicaRole } = this.raw;
+
+        if (PartitionStatus !== 'Reconfiguring') {
+            return ReplicaRole;
         }
+
+        if (!PreviousReplicaRole || PreviousReplicaRole === 'None') {
+            return `Reconfiguring - Target Role: ${ReplicaRole}`;
+        }
+
+        return `Reconfiguring: ${PreviousReplicaRole} ${UnicodeConstants.RightArrow} ${ReplicaRole}`;
+    }
 
+    public get currentRole(): string {
         return this.raw.ReplicaRole;
     }
 
+    public get previousRole(): string {
+        if (this.parent.raw.PartitionStatus === 'Reconfiguring' && this.raw.PreviousReplicaRole) {
+            return this.raw.PreviousReplicaRole;
+        }
+
+        return 'None';
+    }
+
     public get viewPath(): string {
         return RoutesService.getReplicaViewPath(this.parent.parent.parent.raw.TypeName, this.parent.parent.parent.id, this.parent.parent.id, this.parent.id, this.id);
     }

src/SfxWeb/src/app/Models/RawDataTypes.ts

@@ -582,13 +582,21 @@ export interface IRawReplicaHealth extends IRawHealth {
         InstanceId: string;
     }
 
+export interface IReconfigurationInformation {
+    PreviousConfigurationRole: string;
+    ReconfigurationPhase: string;
+    ReconfigurationType: string;
+    ReconfigurationStartTimeUtc: string;
+}
+
 export interface IRawDeployedReplica {
     Address: string;
     CodePackageName: string;
     InstanceId: string;
     LastInBuildDurationInSeconds: string;
     ReplicaId: string;
     PartitionId: string;
+    ReconfigurationInformation: IReconfigurationInformation;
     ReplicaRole: string;
     ReplicaStatus: string;
     ServiceKind: string;
@@ -598,8 +606,6 @@ export interface IRawDeployedReplica {
     ServicePackageActivationId: string;
 }
 
-
-
 export interface IRawDeployedReplicaDetail {
     PartitionId: string;
     InstanceId: string;
@@ -697,6 +703,7 @@ export interface IRawReplicaOnPartition {
         HealthState: string;
         ReplicaId: string;
         ReplicaRole: string;
+        PreviousReplicaRole: string;
         InstanceId: string;
         LastInBuildDurationInSeconds: string;
         NodeName: string;

src/SfxWeb/src/app/modules/partition-replication/replica-status-container/replica-status-container.component.scss

@@ -13,7 +13,6 @@
 .replica-tile {
   grid-column: span 2;
   grid-row: span 2;
-
 }
 
 .expanded-tall {

src/SfxWeb/src/app/modules/partition-replication/replica-tile/replica-tile.component.ts

@@ -46,7 +46,7 @@ export class ReplicaTileComponent implements OnChanges {
         descriptionName: 'Node',
         copyTextValue: this.replica.raw.NodeName,
         displayText: this.replica.raw.NodeName,
-      },
+      }
     ];
 
     this.status = {