Sprint 121 Merge to Master

Apps/Admin/Tests/Functional/cypress/fixtures/DashboardService/age-count.json

@@ -0,0 +1,6 @@
+{
+    "23": 1,
+    "29": 1,
+    "36": 1,
+    "57": 2
+}

Apps/Admin/Tests/Functional/cypress/integration/ui/dashboard.cy.js

@@ -3,6 +3,9 @@ import "cypress-real-events/support";
 // midnight on 2022-07-02, the middle of the year
 const utcDate = new Date(Date.UTC(2022, 7 - 1, 2));
 const localDate = new Date(2022, 7 - 1, 2);
+const defaultMobileCount = 3;
+const salesForceCount = 2;
+const webCount = 4;
 
 function getPastDate(daysAgo) {
     // initialize date to utcDate minus a number of days
@@ -20,7 +23,7 @@ function getPastDate(daysAgo) {
 }
 
 function setupAppLoginCountsFixtures(
-    mobileCount = 3,
+    mobileCount = defaultMobileCount,
     androidCount = 1,
     iosCount = 1
 ) {
@@ -29,8 +32,8 @@ function setupAppLoginCountsFixtures(
             mobile: mobileCount,
             android: androidCount,
             ios: iosCount,
-            web: 4,
-            salesforce: 2,
+            web: webCount,
+            salesforce: salesForceCount,
         },
     });
 }
@@ -62,6 +65,10 @@ describe("Dashboard", () => {
             },
         });
 
+        cy.intercept("GET", "**/Dashboard/AgeCounts*", {
+            fixture: "DashboardService/age-count.json",
+        });
+
         // used to calculate [data-testid=average-rating]
         cy.intercept("GET", "**/Dashboard/Ratings/Summary*", {
             fixture: "DashboardService/summary.json",
@@ -93,9 +100,11 @@ describe("Dashboard", () => {
         cy.get("[data-testid=total-dependents]").contains(2);
         cy.get("[data-testid=average-rating]").contains("4.00");
         cy.get("[data-testid=recurring-user-count]").contains(2);
-        cy.get("[data-testid=total-mobile-users]").contains(3);
-        cy.get("[data-testid=total-web-users]").contains(4);
-        cy.get("[data-testid=total-salesforce-users]").contains(2);
+        cy.get("[data-testid=total-mobile-users]").contains(defaultMobileCount);
+        cy.get("[data-testid=total-web-users]").contains(webCount);
+        cy.get("[data-testid=total-salesforce-users]").contains(
+            salesForceCount
+        );
 
         cy.get("[data-testid=daily-data-table]")
             .find("tbody tr.mud-table-row")
@@ -138,7 +147,17 @@ describe("Dashboard Mobile Login Count Tooltip", () => {
         });
 
         cy.intercept("GET", "**/Dashboard/DailyUsageCounts*", {
-            fixture: "DashboardService/daily-usage-counts.json",
+            body: {
+                userRegistrations: {
+                    [getPastDate(0)]: 2,
+                },
+                userLogins: {
+                    [getPastDate(0)]: 6,
+                },
+                dependentRegistrations: {
+                    [getPastDate(0)]: 2,
+                },
+            },
         });
 
         cy.intercept("GET", "**/Dashboard/Ratings/Summary*", {
@@ -148,6 +167,10 @@ describe("Dashboard Mobile Login Count Tooltip", () => {
         cy.intercept("GET", "**/Dashboard/RecurringUserCount?days=3*", {
             body: 2,
         });
+
+        cy.intercept("GET", "**/Dashboard/AgeCounts*", {
+            fixture: "DashboardService/age-count.json",
+        });
     });
 
     it("Verify tooltip exists with android count > 0 and ios count > 0.", () => {

Apps/Admin/Tests/Functional/cypress/tsconfig.json

@@ -2,7 +2,12 @@
     "compilerOptions": {
         "allowJs": true,
         "baseUrl": "../node_modules",
-        "types": ["cypress", "cy-verify-downloads"],
+        "types": [
+            "cypress",
+            "cy-verify-downloads",
+            "node",
+            "cypress-real-events"
+        ],
         "noEmit": true
     },
     "include": ["**/*.*"]

Apps/Admin/Tests/Functional/package.json

@@ -16,7 +16,7 @@
         "@cypress/skip-test": "^2.6.1",
         "cy-verify-downloads": "^0.1.17",
         "cypress": "^13.6.0",
-        "cypress-real-events": "^1.12.0",
+        "cypress-real-events": "^1.13.0",
         "cypress-xpath": "^1.8.0",
         "eslint": "^8.54.0",
         "eslint-plugin-chai-friendly": "^0.7.2",

Apps/GatewayApi/src/MapProfiles/UserProfileProfile.cs

@@ -37,7 +37,7 @@ public UserProfileProfile()
                 .ForMember(dest => dest.IsEmailVerified, opt => opt.MapFrom(src => !string.IsNullOrEmpty(src.Email)))
                 .ForMember(dest => dest.IsSmsNumberVerified, opt => opt.MapFrom(src => !string.IsNullOrEmpty(src.SmsNumber)))
                 .ForMember(dest => dest.AcceptedTermsOfService, opt => opt.MapFrom(src => src.TermsOfServiceId != Guid.Empty))
-                .ForMember(dest => dest.BetaFeatures, opt => opt.MapFrom(src => GetBetaFeaturesFromCodes(src.BetaFeatureCodes)))
+                .ForMember(dest => dest.BetaFeatures, opt => opt.MapFrom(src => GetBetaFeaturesFromCodes(src.BetaFeatureCodes).Append(Database.Constants.BetaFeature.Salesforce).Distinct()))
                 .ReverseMap();
 
             this.CreateMap<Database.Constants.BetaFeature, BetaFeature>()

Apps/GatewayApi/test/unit/Services.Test/UserProfileServiceTests.cs

@@ -905,6 +905,7 @@ private static UpdateAcceptedTermsMock SetupUpdateAcceptedTermsMock(DbStatusCode
                         HasTermsOfServiceUpdated = true,
                         LastLoginDateTime = lastLoginDateTime,
                         HasTourUpdated = false,
+                        BetaFeatures = [GatewayApi.Constants.BetaFeature.Salesforce],
                     }
                     : null,
                 ResultStatus = updateResult.Status != DbStatusCode.Updated || !userProfileExists
@@ -1024,6 +1025,7 @@ private static CloseUserProfileMock SetupCloseUerProfileMock(DbStatusCode update
                         IsEmailVerified = true,
                         Email = updatedUserProfile.Email,
                         ClosedDateTime = updatedUserProfile.ClosedDateTime,
+                        BetaFeatures = [GatewayApi.Constants.BetaFeature.Salesforce],
                     }
                     : null,
                 ResultStatus = updateResult.Status != DbStatusCode.Updated || !userProfileExists
@@ -1146,6 +1148,7 @@ private static RecoverUserProfileMock SetupRecoverUserProfileMock(DbStatusCode u
                         IsEmailVerified = true,
                         Email = updatedUserProfile.Email,
                         ClosedDateTime = updatedUserProfile.ClosedDateTime,
+                        BetaFeatures = [GatewayApi.Constants.BetaFeature.Salesforce],
                     }
                     : null,
                 ResultStatus = updateResult.Status != DbStatusCode.Updated || !userProfileExists

Apps/WebClient/src/ClientApp/src/models/configData.ts

@@ -118,7 +118,7 @@ export interface ServicesSettings {
 
 export interface ServiceSettings {
     name: string;
-    enabled: string;
+    enabled: boolean;
 }
 
 // Various timeout values used by the VUE WebClient application.

Testing/functional/tests/cypress/integration/e2e/user/betaFeatures.js

@@ -16,14 +16,13 @@ describe("Beta Features", () => {
         cy.get("[data-testid=beta-alert]").should("be.visible");
     });
 
-    it("No Link to Beta Site on Home Page for Unapproved User", () => {
+    it("Link to Beta Site on Home Page for Unapproved User", () => {
         cy.login(
             Cypress.env("keycloak.username"),
             Cypress.env("keycloak.password"),
             AuthMethod.KeyCloak,
             homeUrl
         );
-        cy.get("[data-testid=add-quick-link-button]").should("be.visible");
-        cy.get("[data-testid=beta-alert]").should("not.exist");
+        cy.get("[data-testid=beta-alert]").should("be.visible");
     });
 });