Merge pull request #6962 from davidwatkins73/waltz-6961-report-grid-field-ref-cols

Report Grid: Adding field refs not workings

Author: jessica-woodland-scott

waltz-ng/client/report-grid/components/svelte/report-grid-utils.js

@@ -86,6 +86,7 @@ const nameCol = mkEntityLinkGridCell(
     "right",
     {pinnedLeft: true, width: 200});
 
+
 const extIdCol = {
     field: "subject.entityReference.externalId",
     displayName: "Ext. Id",
@@ -97,6 +98,7 @@ const extIdCol = {
         </div>`
 };
 
+
 const lifecyclePhaseCol = {
     field: "subject.lifecyclePhase",
     displayName: "Lifecycle Phase",
@@ -118,6 +120,7 @@ const unknownRating = {
     position: 0
 };
 
+
 function getFixedColumnName(column) {
     let entityFieldName = _.get(column, ["entityFieldReference", "displayName"], null);
 
@@ -130,6 +133,7 @@ function getFixedColumnName(column) {
         .value();
 }
 
+
 export function getColumnName(column) {
     switch (column.kind) {
         case "REPORT_GRID_FIXED_COLUMN_DEFINITION":
@@ -140,6 +144,7 @@ export function getColumnName(column) {
     }
 }
 
+
 export function getDisplayNameForColumn(c) {
     if (c.displayName != null) {
         return c.displayName;
@@ -280,6 +285,7 @@ function calculateCostColorScales(cellData, columnDefs) {
     return calculateColorScales(cellData, columnDefs, "COST_KIND", "#e2f5ff", "#86e4ff");
 }
 
+
 /**
  * Returns a map of color scales keyed by their column id's
  * @param gridData
@@ -316,6 +322,7 @@ function calculateColorScales(cellData, columnDefs, entityKind, startColor, endC
         .value();
 }
 
+
 const attestationColorScale = scaleLinear()
     .domain([subtractYears(1), new Date()])
     .range(["#ebfdf0", "#96ff86"])
@@ -395,6 +402,7 @@ function mkRatingCell(dataCell, baseCell, ratingSchemeItemsById) {
         });
 }
 
+
 export function combineColDefs(definition) {
     const fixedColDefs = _.get(definition, ["fixedColumnDefinitions"], []);
     const derivedColDefs = _.get(definition, ["derivedColumnDefinitions"], []);
@@ -561,6 +569,7 @@ function countDistinct(optionSummaries, mapper) {
         .value();
 }
 
+
 export function refreshSummaries(tableData,
                                  columnDefinitions) {
 
@@ -707,6 +716,7 @@ function sameDerivedColumnRefs(v1, v2) {
     return name1 === name2;
 }
 
+
 export function sameColumnRef(v1, v2) {
     if (!v1 || !v2) return false;
 
@@ -728,6 +738,7 @@ export function mkLocalStorageFilterKey(gridId) {
     return `waltz-report-grid-${gridId}-active-summaries`
 }
 
+
 export function mkReportGridFixedColumnRef(d, nameProvider = "name") {
     return Object.assign(
         {},
@@ -752,7 +763,7 @@ export function mkReportGridEntityFieldReferenceColumnRef(fieldRef,
                                                           entity,
                                                           qualifierEntity,
                                                           displayName = null,
-                                                          additionalColumnOptions = additionalColumnOptions.NONE) {
+                                                          additionalColOpts = additionalColumnOptions.NONE) {
     return Object.assign(
         {},
         {
@@ -764,7 +775,7 @@ export function mkReportGridEntityFieldReferenceColumnRef(fieldRef,
             columnQualifierKind: qualifierEntity ? qualifierEntity.kind : null,
             columnQualifierId: qualifierEntity ? qualifierEntity.id : null,
             displayName: displayName,
-            additionalColumnOptions: additionalColumnOptions
+            additionalColumnOptions: additionalColOpts.key
         });
 }
 
@@ -785,23 +796,6 @@ export function mkMeasurableColumn(selectedCategory, measurable) {
 }
 
 
-export function mkPrimaryMeasurableFieldColumn(fieldReference, selectedCategory) {
-    return Object.assign(
-        {},
-        {
-            kind: "REPORT_GRID_FIXED_COLUMN_DEFINITION",
-            columnEntityId: "MEASURABLE",
-            columnEntityKind: null,
-            additionalColumnOptions: additionalColumnOptions.PRIMARY.key,
-            entityFieldReference: fieldReference,
-            columnQualifierKind: "MEASURABLE_CATEGORY",
-            columnQualifierId: selectedCategory.id,
-            columnName: `${selectedCategory.name}/Primary Rating`,
-            displayName: null
-        });
-}
-
-
 export function mkMeasurableCategoryColumn(selectedCategory) {
     return Object.assign(
         {},

waltz-schema/src/main/resources/liquibase/db.changelog-1.57.xml

@@ -85,4 +85,20 @@
                           remarks="Indicates if the user must provide a comment when setting this option. Only valid if the assessment/item is not-readonly and is user-selectable"/>
     </changeSet>
 
+    <changeSet id="20240124-6961-1"
+               author="davidwatkins73">
+        <insert tableName="entity_field_reference">
+            <column name="entity_kind" value="MEASURABLE"/>
+            <column name="field_name" value="name"/>
+            <column name="display_name" value="Name"/>
+            <column name="description" value="Name of the viewpoint item"/>
+        </insert>
+        <insert tableName="entity_field_reference">
+            <column name="entity_kind" value="MEASURABLE"/>
+            <column name="field_name" value="external_id"/>
+            <column name="display_name" value="External Id"/>
+            <column name="description" value="External Identifier of the viewpoint item"/>
+        </insert>
+    </changeSet>
+
 </databaseChangeLog>