Task: Adjust feedback popup time (#1496)

microsoftgraph · Mar 1, 2022 · 253c019 · 253c019
1 parent a4c6126
commit 253c019
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/azure-static-web-apps-jolly-sand-0ac78c710.yml b/.github/workflows/azure-static-web-apps-jolly-sand-0ac78c710.yml
@@ -26,6 +26,7 @@ jobs:
           REACT_APP_INSTRUMENTATION_KEY: ${{ secrets.REACT_APP_STAGING_INSTRUMENTATION_KEY }}
           REACT_APP_NOMINATION_PERIOD: ${{secrets.REACT_APP_NOMINATION_PERIOD}}
           REACT_APP_COOLDOWN_PERIOD: ${{secrets.REACT_APP_COOLDOWN_PERIOD}}
+          REACT_APP_USAGE_TIME: ${{secrets.REACT_APP_USAGE_TIME}}
         id: builddeploy
         uses: Azure/[email protected]
         with:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -64,10 +64,10 @@ jobs:
 
       - task: ComponentGovernanceComponentDetection@0
         inputs:
-          scanType: 'Register'
-          verbosity: 'Verbose'
-          alertWarningLevel: 'High'
-          ignoreDirectories: '.github,.vscode/'
+          scanType: "Register"
+          verbosity: "Verbose"
+          alertWarningLevel: "High"
+          ignoreDirectories: ".github,.vscode/"
 
       - task: NodeTool@0
         inputs:
@@ -124,6 +124,7 @@ jobs:
           REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID: $(REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID)
           REACT_APP_NOMINATION_PERIOD: $(REACT_APP_NOMINATION_PERIOD)
           REACT_APP_COOLDOWN_PERIOD: $(REACT_APP_COOLDOWN_PERIOD)
+          REACT_APP_USAGE_TIME: $(REACT_APP_USAGE_TIME)
         displayName: "Build static assets for staging"
 
       - task: PowerShell@2
@@ -148,6 +149,7 @@ jobs:
           REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID: $(REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID)
           REACT_APP_NOMINATION_PERIOD: $(REACT_APP_NOMINATION_PERIOD)
           REACT_APP_COOLDOWN_PERIOD: $(REACT_APP_COOLDOWN_PERIOD)
+          REACT_APP_USAGE_TIME: $(REACT_APP_USAGE_TIME)
         displayName: "Build static assets for prod"
 
       - task: PowerShell@2
@@ -165,13 +167,13 @@ jobs:
           BuildComponentPath: "$(System.DefaultWorkingDirectory)/build"
           PackageName: "graph-explorer-v2"
           PackageVersion: "$(Build.UpdateBuildNumber)"
-      
+
       - task: CopyFiles@1
         displayName: "Copy manifest files to artifact staging dir: manifest"
         inputs:
           SourceFolder: "$(System.DefaultWorkingDirectory)/_manifest"
           TargetFolder: "$(Build.ArtifactStagingDirectory)/manifest"
-      
+
       - task: PublishBuildArtifacts@1
         displayName: "Publish Artifact: manifest"
         inputs:

diff --git a/src/app/views/query-runner/request/feedback/campaignDefinitions.ts b/src/app/views/query-runner/request/feedback/campaignDefinitions.ts
@@ -37,7 +37,7 @@ const CampaignDefinitions: object[] = [{
                 [{
                   'Type': 0,
                   'Activity': 'AppUsageTime',
-                  'Count': 60,
+                  'Count': (NODE_ENV === 'development') ? 60 : process.env.REACT_APP_USAGE_TIME, //in seconds
                   'IsAggregate': true
                 },
                 {