From f76aa59be150cc7477e33729c05b2ac844bf8d7b Mon Sep 17 00:00:00 2001
From: David Watkins <davidwatkins73@gmail.com>
Date: Mon, 5 Sep 2022 12:39:07 +0100
Subject: [PATCH 1/2] Survey lists show template name

- was confusing if run's were given ambiguous names...

#6210
---
 .../SurveyInstanceInfoPanel.svelte            |  4 ++
 .../instance-list/survey-instance-list.html   |  9 +++-
 .../instance-list/survey-instance-list.js     | 49 ++++++++++++-------
 .../svelte/SurveyApproverInfoPanel.svelte     |  5 +-
 .../svelte/SurveyRecipientInfoPanel.svelte    |  5 +-
 .../survey/services/survey-template-store.js  |  2 +-
 6 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/waltz-ng/client/common/svelte/info-panels/SurveyInstanceInfoPanel.svelte b/waltz-ng/client/common/svelte/info-panels/SurveyInstanceInfoPanel.svelte
index fce9074929..ef43870c46 100644
--- a/waltz-ng/client/common/svelte/info-panels/SurveyInstanceInfoPanel.svelte
+++ b/waltz-ng/client/common/svelte/info-panels/SurveyInstanceInfoPanel.svelte
@@ -73,6 +73,10 @@
     <slot name="pre-header"/>
     <table class="table table-condensed small">
         <tbody>
+            <tr>
+                <td width="50%">Template Name</td>
+                <td width="50%">{survey.surveyTemplateRef?.name}</td>
+            </tr>
             <tr>
                 <td width="50%">Run Name</td>
                 <td width="50%">{survey.surveyRun?.name}</td>
diff --git a/waltz-ng/client/survey/components/instance-list/survey-instance-list.html b/waltz-ng/client/survey/components/instance-list/survey-instance-list.html
index f2e98156d9..9f2c041e2c 100644
--- a/waltz-ng/client/survey/components/instance-list/survey-instance-list.html
+++ b/waltz-ng/client/survey/components/instance-list/survey-instance-list.html
@@ -73,8 +73,10 @@
            ng-if="surveys.length > 0">
         <thead>
         <tr>
-            <th>Title</th>
-            <th>Name</th>
+            <th>Template Name</th>
+            <th>Template Name</th>
+            <th>Run Name</th>
+            <th>Instance Name</th>
             <th ng-if="$ctrl.visibility.showSurveySubject">Subject</th>
             <th>Status</th>
             <th>Issued On</th>
@@ -86,6 +88,9 @@
         </thead>
         <tbody>
         <tr ng-repeat="row in surveys | orderBy:'surveyRun.name'">
+            <td>
+                <span ng-bind="row.surveyTemplate.name"></span>
+            </td>
             <td>
                 <a ng-bind="row.surveyRun.name"
                    class="clickable"
diff --git a/waltz-ng/client/survey/components/instance-list/survey-instance-list.js b/waltz-ng/client/survey/components/instance-list/survey-instance-list.js
index e1133b19c6..378213f6d7 100644
--- a/waltz-ng/client/survey/components/instance-list/survey-instance-list.js
+++ b/waltz-ng/client/survey/components/instance-list/survey-instance-list.js
@@ -39,23 +39,34 @@ const initialState = {
 };
 
 
-function mkTableData(surveyRuns = [], surveyInstances = []) {
+function mkTableData(surveyRuns = [], surveyInstances = [], templates = []) {
     const runsById = _.keyBy(surveyRuns, "id");
-
-    const surveys = _.map(surveyInstances, instance => {
-        return {
-            "surveyInstance": instance,
-            "surveyRun": runsById[instance.surveyRunId],
-            "surveyEntity": instance.surveyEntity
-        }
-    });
+    const templatesById = _.keyBy(templates, "id");
+
+    const surveys = _.map(
+        surveyInstances,
+        instance => {
+            const run = runsById[instance.surveyRunId];
+            const template = run
+                ? templatesById[run.surveyTemplateId]
+                : null;
+
+            return {
+                "surveyInstance": instance,
+                "surveyRun": run,
+                "surveyEntity": instance.surveyEntity,
+                "surveyTemplate": template
+            };
+        });
 
     const now = moment();
-    const grouped = _.groupBy(surveys, s => {
-        const subMoment = moment(s.surveyInstance.submittedAt);
-        return s.surveyInstance.status == "WITHDRAWN" || now.diff(subMoment, "months") >= 12 ? "ARCHIVE" : "CURRENT"
-    });
-    return grouped;
+
+    return _.groupBy(
+        surveys,
+        s => {
+            const subMoment = moment(s.surveyInstance.submittedAt);
+            return s.surveyInstance.status === "WITHDRAWN" || now.diff(subMoment, "months") >= 12 ? "ARCHIVE" : "CURRENT"
+        });
 }
 
 
@@ -78,6 +89,10 @@ function controller($q, serviceBroker) {
             let runsPromise;
             let instancesPromise;
 
+            const templatePromise = serviceBroker.loadAppData(
+                CORE_API.SurveyTemplateStore.findAll,
+                []);
+
             if (vm.parentEntityRef.kind === 'PERSON') {
                 runsPromise = serviceBroker.loadViewData(
                     CORE_API.SurveyRunStore.findForRecipientId,
@@ -102,9 +117,9 @@ function controller($q, serviceBroker) {
 
             vm.visibility.showSurveySubject = ! isSurveyTargetKind(vm.parentEntityRef.kind);
 
-            $q.all([runsPromise, instancesPromise])
-                .then(([runsResult, instancesResult]) =>
-                    vm.surveys = mkTableData(runsResult.data, instancesResult.data));
+            $q.all([runsPromise, instancesPromise, templatePromise])
+                .then(([runsResult, instancesResult, templateResult]) =>
+                    vm.surveys = mkTableData(runsResult.data, instancesResult.data, templateResult.data));
         }
     };
 
diff --git a/waltz-ng/client/survey/components/svelte/SurveyApproverInfoPanel.svelte b/waltz-ng/client/survey/components/svelte/SurveyApproverInfoPanel.svelte
index e2d1e543bc..f94264ffeb 100644
--- a/waltz-ng/client/survey/components/svelte/SurveyApproverInfoPanel.svelte
+++ b/waltz-ng/client/survey/components/svelte/SurveyApproverInfoPanel.svelte
@@ -171,7 +171,10 @@
     <table class="table table-condensed">
         <thead>
         <tr>
-            <th width="30%">Survey Name</th>
+            <th width="30%"
+                style="text-align: left">
+                Survey Name
+            </th>
             {#each tableHeaders as header}
                 <th width={`${70 / tableHeaders.length}%`}
                     class={header.headerClass}
diff --git a/waltz-ng/client/survey/components/svelte/SurveyRecipientInfoPanel.svelte b/waltz-ng/client/survey/components/svelte/SurveyRecipientInfoPanel.svelte
index 64056a91ff..e4fd2c79c5 100644
--- a/waltz-ng/client/survey/components/svelte/SurveyRecipientInfoPanel.svelte
+++ b/waltz-ng/client/survey/components/svelte/SurveyRecipientInfoPanel.svelte
@@ -183,7 +183,10 @@
     <table class="table table-condensed">
         <thead>
         <tr>
-            <th width="30%">Survey Name</th>
+            <th width="30%"
+                style="text-align: left">
+                Survey Name
+            </th>
             {#each tableHeaders as header}
                 <th width={`${60 / tableHeaders.length}%`}
                     class={header.headerClass}
diff --git a/waltz-ng/client/survey/services/survey-template-store.js b/waltz-ng/client/survey/services/survey-template-store.js
index ad9dc7c8bd..eb1b03b876 100644
--- a/waltz-ng/client/survey/services/survey-template-store.js
+++ b/waltz-ng/client/survey/services/survey-template-store.js
@@ -36,7 +36,7 @@ function store($http, baseUrl) {
     };
 
     const findAll = () => {
-        return $http.get(`${BASE}`)
+        return $http.get(BASE)
             .then(result => result.data);
     };
 

From 02ce00ceaa68052b7f7169c6362f557aa7df8a22 Mon Sep 17 00:00:00 2001
From: David Watkins <davidwatkins73@gmail.com>
Date: Mon, 5 Sep 2022 12:40:38 +0100
Subject: [PATCH 2/2] Survey lists show template name

- was confusing if run's were given ambiguous names...

#6210
---
 .../survey/components/instance-list/survey-instance-list.html    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/waltz-ng/client/survey/components/instance-list/survey-instance-list.html b/waltz-ng/client/survey/components/instance-list/survey-instance-list.html
index 9f2c041e2c..e73eee8b69 100644
--- a/waltz-ng/client/survey/components/instance-list/survey-instance-list.html
+++ b/waltz-ng/client/survey/components/instance-list/survey-instance-list.html
@@ -73,7 +73,6 @@
            ng-if="surveys.length > 0">
         <thead>
         <tr>
-            <th>Template Name</th>
             <th>Template Name</th>
             <th>Run Name</th>
             <th>Instance Name</th>