Merge pull request #6298 from deutschebank/db-contrib/waltz-6276-webpack5

Db contrib/waltz 6276 webpack5

Author: davidwatkins73

waltz-data/src/main/java/org/finos/waltz/data/report_grid/ReportGridDao.java

@@ -72,7 +72,7 @@
 import static org.finos.waltz.common.MapUtilities.groupBy;
 import static org.finos.waltz.common.MapUtilities.indexBy;
 import static org.finos.waltz.common.SetUtilities.*;
-import static org.finos.waltz.common.StringUtilities.join;
+import static org.finos.waltz.common.StringUtilities.*;
 import static org.finos.waltz.common.hierarchy.HierarchyUtilities.toForest;
 import static org.finos.waltz.data.JooqUtilities.fieldsWithout;
 import static org.finos.waltz.model.EntityReference.mkRef;
@@ -725,13 +725,13 @@ private Set<ReportGridCell> findCellDataByGridCondition(Condition gridCondition,
                     gridDefn.fixedColumnDefinitions(),
                     d -> d.entityFieldReference() == null);
 
-            Collection<ReportGridFixedColumnDefinition> simpleGridDefs = gridDefinitionsByContainingFieldRef.getOrDefault(true, emptySet());
-            Collection<ReportGridFixedColumnDefinition> complexGridDefs = gridDefinitionsByContainingFieldRef.getOrDefault(false, emptySet());
+            Collection<ReportGridFixedColumnDefinition> simpleColDefs = gridDefinitionsByContainingFieldRef.getOrDefault(true, emptySet());
+            Collection<ReportGridFixedColumnDefinition> fieldRefColDefs = gridDefinitionsByContainingFieldRef.getOrDefault(false, emptySet());
 
             // SIMPLE GRID DEFS
 
             Map<EntityKind, Collection<ReportGridFixedColumnDefinition>> colsByKind = groupBy(
-                    simpleGridDefs,
+                    simpleColDefs,
                     ReportGridFixedColumnDefinition::columnEntityKind);
 
             Map<AdditionalColumnOptions, Collection<ReportGridFixedColumnDefinition>> measurableColumnsByRollupKind = groupBy(
@@ -743,12 +743,12 @@ private Set<ReportGridCell> findCellDataByGridCondition(Condition gridCondition,
                     d -> d.additionalColumnOptions() == AdditionalColumnOptions.NONE);
 
 
-            // COMPLEX GRID DEFS
+            // FIELD REF COL DEFS
 
             Map<Long, EntityFieldReference> fieldReferencesById = dsl
                     .select(efr.fields())
                     .from(efr)
-                    .where(efr.ID.in(map(complexGridDefs, r -> r.entityFieldReference().id().get())))
+                    .where(efr.ID.in(map(fieldRefColDefs, r -> r.entityFieldReference().id().get())))
                     .fetchMap(
                             r -> r.get(efr.ID),
                             r -> ImmutableEntityFieldReference.builder()
@@ -759,7 +759,7 @@ private Set<ReportGridCell> findCellDataByGridCondition(Condition gridCondition,
                                     .description(r.get(efr.DESCRIPTION))
                                     .build());
 
-            Map<EntityKind, Set<Tuple2<ReportGridFixedColumnDefinition, EntityFieldReference>>> complexColsByKind = complexGridDefs
+            Map<EntityKind, Set<Tuple2<ReportGridFixedColumnDefinition, EntityFieldReference>>> fieldRefColsByKind = fieldRefColDefs
                     .stream()
                     .map(d -> tuple(d, fieldReferencesById.get(d.entityFieldReference().id().get())))
                     .collect(groupingBy(t -> t.v2.entityKind(), toSet()));
@@ -776,21 +776,139 @@ private Set<ReportGridCell> findCellDataByGridCondition(Condition gridCondition,
                             measurableColumnsByRollupKind.getOrDefault(AdditionalColumnOptions.PICK_LOWEST, emptySet())),
                     fetchExactMeasurableData(genericSelector, measurableColumnsByRollupKind.get(AdditionalColumnOptions.NONE)),
                     fetchSurveyQuestionResponseData(genericSelector, colsByKind.get(EntityKind.SURVEY_QUESTION)),
+                    fetchSurveyTemplateResponseData(genericSelector, colsByKind.get(EntityKind.SURVEY_TEMPLATE)),
                     fetchAppGroupData(genericSelector, colsByKind.get(EntityKind.APP_GROUP)),
-                    fetchApplicationFieldReferenceData(genericSelector, complexColsByKind.get(EntityKind.APPLICATION)),
+                    fetchApplicationFieldReferenceData(genericSelector, fieldRefColsByKind.get(EntityKind.APPLICATION)),
                     fetchExactDataTypeData(genericSelector, dataTypeColumnsByIsExact.get(Boolean.TRUE)),
                     fetchSummaryDataTypeData(genericSelector, dataTypeColumnsByIsExact.get(Boolean.FALSE)),
-                    fetchSurveyFieldReferenceData(genericSelector, complexColsByKind.get(EntityKind.SURVEY_INSTANCE)),
-                    fetchChangeInitiativeFieldReferenceData(genericSelector, complexColsByKind.get(EntityKind.CHANGE_INITIATIVE)),
+                    fetchSurveyFieldReferenceData(genericSelector, fieldRefColsByKind.get(EntityKind.SURVEY_INSTANCE)),
+                    fetchChangeInitiativeFieldReferenceData(genericSelector, fieldRefColsByKind.get(EntityKind.CHANGE_INITIATIVE)),
                     fetchAttestationData(genericSelector, colsByKind.get(EntityKind.ATTESTATION)),
-                    fetchOrgUnitFieldReferenceData(genericSelector, complexColsByKind.get(EntityKind.ORG_UNIT)),
+                    fetchOrgUnitFieldReferenceData(genericSelector, fieldRefColsByKind.get(EntityKind.ORG_UNIT)),
                     fetchTagData(genericSelector, colsByKind.get(EntityKind.TAG)),
                     fetchAliasData(genericSelector, colsByKind.get(EntityKind.ENTITY_ALIAS)),
                     fetchMeasurableHierarchyData(genericSelector, colsByKind.get(EntityKind.MEASURABLE_CATEGORY)),
                     fetchEntityStatisticData(genericSelector, colsByKind.get(EntityKind.ENTITY_STATISTIC)));
         }
     }
 
+
+    private Set<ReportGridCell> fetchSurveyTemplateResponseData(GenericSelector genericSelector,
+                                                                Collection<ReportGridFixedColumnDefinition> cols) {
+        if (isEmpty(cols)) {
+            return emptySet();
+        } else {
+            Map<EntityKind, Collection<ReportGridFixedColumnDefinition>> colsByQualifierKind = groupBy(
+                    cols,
+                    ReportGridFixedColumnDefinition::columnQualifierKind);
+
+            return union(
+                fetchSurveyRecipients(genericSelector, colsByQualifierKind.getOrDefault(EntityKind.SURVEY_INSTANCE_RECIPIENT, emptySet())),
+                fetchSurveyApprovers(genericSelector, colsByQualifierKind.getOrDefault(EntityKind.SURVEY_INSTANCE_OWNER, emptySet())));
+        }
+    }
+
+
+    private Set<ReportGridCell> fetchSurveyApprovers(GenericSelector selector,
+                                                     Collection<ReportGridFixedColumnDefinition> cols) {
+        return fetchSurveyPeople(
+                selector,
+                cols,
+                "Approver",
+                SURVEY_INSTANCE_OWNER,
+                SURVEY_INSTANCE_OWNER.SURVEY_INSTANCE_ID,
+                SURVEY_INSTANCE_OWNER.PERSON_ID);
+    }
+
+
+    private Set<ReportGridCell> fetchSurveyRecipients(GenericSelector selector,
+                                                  Collection<ReportGridFixedColumnDefinition> cols) {
+        return fetchSurveyPeople(
+                selector,
+                cols,
+                "Recipient",
+                SURVEY_INSTANCE_RECIPIENT,
+                SURVEY_INSTANCE_RECIPIENT.SURVEY_INSTANCE_ID,
+                SURVEY_INSTANCE_RECIPIENT.PERSON_ID);
+    }
+
+
+    private Set<ReportGridCell> fetchSurveyPeople(GenericSelector selector,
+                                                  Collection<ReportGridFixedColumnDefinition> cols,
+                                                  String htmlColumnHeading,
+                                                  Table<?> linkedPersonTable,
+                                                  Field<Long> surveyInstanceIdField,
+                                                  Field<Long> personIdField) {
+
+        if (isEmpty(cols)) {
+            return emptySet();
+        } else {
+            Map<Long, Long> templateToColId = indexBy(cols,
+                    ReportGridFixedColumnDefinition::columnEntityId,
+                    ReportGridFixedColumnDefinition::gridColumnId);
+
+            Set<Long> surveyTemplateIds = map(cols, ReportGridFixedColumnDefinition::columnEntityId);
+
+            Field<Long> latestInstance = DSL
+                    .firstValue(SURVEY_INSTANCE.ID)
+                    .over()
+                    .partitionBy(SURVEY_INSTANCE.ENTITY_ID, SURVEY_INSTANCE.ENTITY_KIND)
+                    .orderBy(SURVEY_INSTANCE.SUBMITTED_AT.desc().nullsLast())
+                    .as("latest_instance");
+
+            Table<Record4<Long, Long, Long, Long>> surveyInfo = dsl
+                    .select(latestInstance,
+                            SURVEY_INSTANCE.ID.as("sid"),
+                            SURVEY_INSTANCE.ENTITY_ID.as("eid"),
+                            SURVEY_RUN.SURVEY_TEMPLATE_ID.as("tid"))
+                    .from(SURVEY_INSTANCE)
+                    .innerJoin(SURVEY_RUN)
+                    .on(SURVEY_INSTANCE.SURVEY_RUN_ID.eq(SURVEY_RUN.ID))
+                    .where(SURVEY_INSTANCE.ENTITY_ID.in(selector.selector())
+                            .and(SURVEY_INSTANCE.ENTITY_KIND.eq(selector.kind().name()))
+                            .and(SURVEY_RUN.SURVEY_TEMPLATE_ID.in(surveyTemplateIds))
+                            .and(SURVEY_INSTANCE.ORIGINAL_INSTANCE_ID.isNull()))
+                    .asTable();
+
+            SelectConditionStep<Record> qry = dsl
+                    .select(surveyInfo.fields())
+                    .select(PERSON.EMAIL, PERSON.DISPLAY_NAME, PERSON.EMPLOYEE_ID)
+                    .from(surveyInfo)
+                    .innerJoin(linkedPersonTable).on(surveyInstanceIdField.eq(latestInstance))
+                    .innerJoin(PERSON).on(PERSON.ID.eq(personIdField).and(PERSON.IS_REMOVED.isFalse()))
+                    .where(surveyInfo.field(latestInstance)
+                            .eq(surveyInfo.field("sid", Long.class)));
+
+            return qry
+                    .fetchGroups(
+                        r -> tuple(
+                                r.get("eid", Long.class),
+                                r.get("tid", Long.class)),
+                        r -> tuple(
+                                r.get(PERSON.DISPLAY_NAME),
+                                r.get(PERSON.EMAIL),
+                                r.get(PERSON.EMPLOYEE_ID)))
+                    .entrySet()
+                    .stream()
+                    .map(kv -> kv.getKey().concat(kv.getValue()))
+                    .map(t -> t.map2(templateToColId::get)) // templateId
+                    .map(t -> ImmutableReportGridCell
+                            .builder()
+                            .textValue(t.v3 // people
+                                    .stream()
+                                    .map(p -> toMailbox(p.v1, p.v2)) // display name, email
+                                    .collect(joining("; ")))
+                            .comment(toHtmlTable(
+                                    asList(htmlColumnHeading, "email", "Employee id"),
+                                    t.v3))
+                            .columnDefinitionId(t.v2) // colId
+                            .subjectId(t.v1) // entityId
+                            .build())
+                    .collect(toSet());
+        }
+    }
+
+
     public Set<ReportGridCell> fetchMeasurableHierarchyData(GenericSelector genericSelector,
                                                             Collection<ReportGridFixedColumnDefinition> cols) {
         if (isEmpty(cols)) {
@@ -1504,33 +1622,42 @@ private Set<ReportGridCell> fetchInvolvementData(GenericSelector selector,
                     ReportGridFixedColumnDefinition::columnEntityId,
                     ReportGridFixedColumnDefinition::gridColumnId);
 
-            return fromCollection(dsl
+            return dsl
                     .select(
                             inv.ENTITY_ID,
                             inv.KIND_ID,
-                            p.EMAIL)
+                            p.EMAIL,
+                            p.DISPLAY_NAME,
+                            p.EMPLOYEE_ID)
                     .from(inv)
                     .innerJoin(p).on(p.EMPLOYEE_ID.eq(inv.EMPLOYEE_ID))
                     .where(inv.ENTITY_KIND.eq(selector.kind().name()))
                     .and(inv.ENTITY_ID.in(selector.selector()))
                     .and(inv.KIND_ID.in(involvementIdToDefIdMap.keySet()))
                     .and(p.IS_REMOVED.isFalse())
-                    .fetchSet(r -> ImmutableReportGridCell
+                    .fetchGroups(
+                            r -> tuple(
+                                r.get(inv.ENTITY_ID),
+                                involvementIdToDefIdMap.get(r.get(inv.KIND_ID))),
+                            r -> tuple(
+                                r.get(p.DISPLAY_NAME),
+                                r.get(p.EMAIL),
+                                r.get(p.EMPLOYEE_ID)))  // {(subject, colDefId) -> (display, email, empId)}
+                    .entrySet()
+                    .stream()
+                    .map(kv -> ImmutableReportGridCell
                             .builder()
-                            .subjectId(r.get(inv.ENTITY_ID))
-                            .columnDefinitionId(involvementIdToDefIdMap.get(r.get(inv.KIND_ID)))
-                            .textValue(r.get(p.EMAIL))
+                            .textValue(kv.getValue() // people
+                                    .stream()
+                                    .map(p -> toMailbox(p.v1, p.v2)) // display name, email
+                                    .collect(joining("; ")))
+                            .comment(toHtmlTable(
+                                    asList("Person", "email", "Employee id"),
+                                    kv.getValue()))
+                            .subjectId(kv.getKey().v1) // entityId
+                            .columnDefinitionId(kv.getKey().v2) // colId
                             .build())
-                    // we now convert to a map so we can merge text values of cells with the same coordinates (appId, entId)
-                    .stream()
-                    .collect(toMap(
-                            c -> tuple(c.subjectId(), c.columnDefinitionId()),
-                            identity(),
-                            (a, b) -> ImmutableReportGridCell
-                                    .copyOf(a)
-                                    .withTextValue(a.textValue() + "; " + b.textValue())))
-                    // and then we simply return the values of that temporary map.
-                    .values());
+                    .collect(Collectors.toSet());
         }
     }
 

waltz-ng/client/assessments/components/list/AssessmentRatingList.svelte

@@ -177,7 +177,7 @@
                     </td>
                     <td colspan="2"
                         class="clickable"
-                        on:click={() => toggleGroup(group)}>
+                        on:click,keydown={() => toggleGroup(group)}>
                         <strong>
                             <span>{group.groupName}</span>
                         </strong>

waltz-ng/client/assessments/components/list/AssessmentRatingListGroup.svelte

@@ -40,7 +40,7 @@
 
 {#each group.provided as row}
     <tr transition:fade
-        on:click={() => selectAssessment(row)}
+        on:click,keydown={() => selectAssessment(row)}
         class="clickable">
         <td>
             <button class="btn btn-skinny"
@@ -87,7 +87,7 @@
                 </button>
             </td>
             <td class="clickable"
-                on:click={() => notProvidedCollapsed = false}>
+                on:click,keydown={() => notProvidedCollapsed = false}>
                 <strong>Not Rated</strong>
             </td>
             <td class="force-wrap">
@@ -116,7 +116,7 @@
             </td>
             <td colspan="2"
                 class="clickable"
-                on:click={() => notProvidedCollapsed = true}>
+                on:click,keydown={() => notProvidedCollapsed = true}>
                 <strong>Not Rated</strong>
             </td>
         </tr>

waltz-ng/client/bookmarks/svelte/BookmarkCategoryMenu.svelte

@@ -32,7 +32,7 @@
             class:selected={eq(selected, bookmarkKind)}
             class:clickable={bookmarkKind.count > 0}
             class:text-muted={bookmarkKind.count === 0}
-            on:click={() => bookmarkKind.count > 0 && bookmarkKindSelected(bookmarkKind)}>
+            on:click,keydown={() => bookmarkKind.count > 0 && bookmarkKindSelected(bookmarkKind)}>
 
             <Icon name={bookmarkKind.icon}/>
 

waltz-ng/client/common/svelte/DropdownPicker.svelte

@@ -52,7 +52,7 @@
                 {#if selectedItem}
                     <li>
                         <div class="text-muted clickable force-wrap"
-                             on:click={() => selectItem(null)}>
+                             on:click,keydown={() => selectItem(null)}>
                             {defaultMessage}
                         </div>
                     </li>

waltz-ng/client/common/svelte/MiniActions.svelte

@@ -10,7 +10,7 @@
     {#each actions as action}
         <li class="clickable"
             title="{action.description}"
-            on:click={() => action.handleAction(ctx)}>
+            on:click,keydown={() => action.handleAction(ctx)}>
             <button class="btn btn-skinny">
                 {#if action.icon}<Icon name={action.icon}/>{/if}
                 {#if action.name}{action.name}{/if}

waltz-ng/client/common/svelte/PageHeader.svelte

@@ -42,7 +42,7 @@
 
     <div class="header-sticky"
          class:stickyVisible
-         on:click={() => pageY = 0}>
+         on:click,keydown={() => pageY = 0}>
 
         <h2 class="clickable">
             <Icon name={icon}/>

waltz-ng/client/common/svelte/SearchInput.svelte

@@ -13,7 +13,7 @@
            bind:value>
     <div class="input-group-addon">
         {#if value.length > 0}
-            <span on:click={() => value = ""}
+            <span on:click,keydown={() => value = ""}
                   class="clickable">
                 <Icon class="clickable"
                       name="times"/>

waltz-ng/client/common/svelte/calendar-heatmap/CalendarHeatmap.svelte

@@ -61,7 +61,7 @@
                           on:mouseenter={() => hoveredMonth = idx}
                           on:mouseleave={() => hoveredMonth = null}
                           fill={hoveredMonth === idx ? "#eee" : "#fff"}
-                          on:click={() => onSelectMonth(_.map(monthData.days, d => d.date))}>
+                          on:click,keydown={() => onSelectMonth(_.map(monthData.days, d => d.date))}>
                     </rect>
                 </g>
                 <text transform={`translate(${7 * dimensions.day.width / 2})`}

waltz-ng/client/common/svelte/calendar-heatmap/Day.svelte

@@ -18,7 +18,7 @@
         r={dimensions.circleRadius}
         fill={noData ? "#eee" : color}
         stroke={noData ? "#bbb" : stroke}
-        on:click={() => onSelect(data.date)}>
+        on:click,keydown={() => onSelect(data.date)}>
 </circle>