@genesislcap/pbc-reporting-ui 14.396.3 → 14.397.0

package/dist/dts/new/types/misc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../src/new/types/misc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEvF,yBAAiB,OAAO,CAAC;IAChB,MAAM,iBAAiB,qIAapB,CAAC;IAEX,KAAY,iBAAiB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;IAEnE,KAAY,WAAW,GAAG,aAAa,GAAG;QACxC,UAAU,CAAC,EACP;YACE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG;gBAAE,WAAW,EAAE,iBAAiB,CAAA;aAAE,CAAC;SACnE,GACD,SAAS,CAAC;KACf,CAAC;IAEF,KAAY,kBAAkB,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;QAC9D,YAAY,EAAE,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC;QACjD,SAAS,EAAE,QAAQ,EAAE,CAAC;KACvB,CAAC;IAEK,MAAM,iBAAiB;;;;;;;;;;KAUpB,CAAC;IAEX,KAAY,YAAY;QACtB,eAAe,kBAAkB;QACjC,mBAAmB,sBAAsB;QACzC,gBAAgB,mBAAmB;KACpC;IAED,KAAY,kBAAkB,GAAG;QAC/B,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;QAC5C,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;QAC5C,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QACtC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QACtC,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QACxC,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QACxC,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QACvC,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QACvC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;KAC7C,CAAC;CACH;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI;IAAE,CAAC,EAAE,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,CAAC,EAAE,KAAK,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC"}
+{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../src/new/types/misc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,QAAQ,EACR,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,yBAAiB,OAAO,CAAC;IAChB,MAAM,iBAAiB,qIAapB,CAAC;IAEX,KAAY,iBAAiB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;IAEnE,KAAY,WAAW,GAAG,aAAa,GAAG;QACxC,UAAU,CAAC,EACP;YACE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG;gBAAE,WAAW,EAAE,iBAAiB,CAAA;aAAE,CAAC;SACnE,GACD,SAAS,CAAC;KACf,CAAC;IAEF,KAAY,kBAAkB,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG;QAC9D,YAAY,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,EAAE,mBAAmB,GAAG,WAAW,CAAC,GACtF,CAAC,OAAO,CAAC,kBAAkB,EAAE;YAAE,iBAAiB,EAAE,MAAM,CAAA;SAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;QACvE,SAAS,EAAE,QAAQ,EAAE,CAAC;KACvB,CAAC;IAEK,MAAM,iBAAiB;;;;;;;;;;KAUpB,CAAC;IAEX,KAAY,YAAY;QACtB,eAAe,kBAAkB;QACjC,mBAAmB,sBAAsB;QACzC,gBAAgB,mBAAmB;KACpC;IAED,KAAY,kBAAkB,GAAG;QAC/B,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;QAC5C,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;QAC5C,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QACtC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QACtC,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QACxC,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QACxC,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QACvC,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QACvC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;KAC7C,CAAC;CACH;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI;IAAE,CAAC,EAAE,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,CAAC,EAAE,KAAK,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC"}

package/dist/dts/new/utils/alias-generator.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Generates a unique alias by appending a counter if the base alias already exists in the set.
+ * @param baseAlias The desired alias name (usually the resource name).
+ * @param existingAliases A Set of currently used aliases to check against.
+ * @returns A unique alias string.
+ */
+export declare function generateUniqueAlias(baseAlias: string, existingAliases: Set<string>): string;
+//# sourceMappingURL=alias-generator.d.ts.map

package/dist/dts/new/utils/alias-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"alias-generator.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/alias-generator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAW3F"}

package/dist/dts/new/utils/alias-generator.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=alias-generator.test.d.ts.map

package/dist/dts/new/utils/alias-generator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"alias-generator.test.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/alias-generator.test.ts"],"names":[],"mappings":""}

package/dist/dts/new/utils/index.d.ts

@@ -1,3 +1,4 @@
+export * from './alias-generator';
 export * from './endpoint';
 export * from './formatters';
 export * from './notifications';

package/dist/dts/new/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC"}

package/dist/dts/new/utils/tooltip.d.ts

@@ -7,8 +7,11 @@ export declare namespace TOOLTIP {
     const SETUP_DESCRIPTION = "\n  <h3>Description</h3>\n  <p>Here you may optionally include a more detailed description describing this report configuration.</p>\n";
     const SETUP_FILE_TYPE = "\n  <h3>File type</h3>\n  <p>Select the type of file to use when generating the report. You can choose between CSV, XLSX, and PDF</p>\n  <ul>\n    <li><strong>CSV</strong>: Generates a CSV report. Selecting a template is optional</li>\n    <li><strong>XLSX</strong>: Generates an Excel workbook. Selecting a template is optional</li>\n    <li><strong>PDF</strong>: Generates a PDF file. Selecting a template is mandatory</li>\n  </ul>\n";
     const SETUP_FILE_TEMPLATE = "\n  <h3>File template</h3>\n  <p>The template file to use when generating the report. This will only display relevant template files that are available in the Document Manager for the file type configured.</p>\n  <ul>\n    <li>Where File type is set to <strong>CSV</strong> you may optionally select a <code>.csv</code> or <code>.txt</code> template. To use multiple datasources with <strong>CSV</strong> you must select a template.</li>\n    <li>Where File type is set to <strong>XLSX</strong> you may optionally select a <code>.xls</code> or <code>.xlsx</code> template. Where no template file is selected, the workbook will be generated with a tab for each of the data sources configured in the \"Add Datasources\" step.</li>\n    <li>Where File type is set to <strong>PDF</strong> you must select a <code>.html</code> or <code>.xhtml</code> template that you've uploaded to the document manager PBC</li>\n  </ul>\n  ";
+    const DATASOURCES_DATASOURCE = "\n  <h3>Datasource</h3>\n  <p>This is the name of the server resource that data will be pulled from to generate the report.</p>\n";
     const DATASOURCES_NAME = "\n  <h3>Datasource name</h3>\n  <p>Allows you to set a name for the datasource which must correspond with your template data references where the report is configured to use a template file.</p>\n  <p>Where File Type is XLSX and no template is selected, this will be the name of the tab containing this data source's data in the resulting workbook.</p>\n";
     const DATASOURCES_TYPE = "\n  <h3>Datasource type</h3>\n  <p>Configures the method by which the server constructs the report configuration. Currently only TABLE is supported, which means the entire datasource is loaded into memory when generating the report using this report configuration.</p>\n";
+    const DATASOURCES_GROUPING_STRATEGY = "\n  <h3>Grouping Strategy</h3>\n  <p>Select \"None\" to disable grouping strategies, or select the strategy you'd like to use.</p>\n  <ul>\n    <li><strong>Multi-sheet</strong>: Group data for <code>JXLS</code> template Multi-sheet functionality, to split different groups across multiple excel worksheets.</li>\n    <li><strong>Lookup-table</strong>: Create a lookup table of key value pairs in the template data, where the group key field is the map key.</li>\n  </ul>\n";
+    const DATASOURCES_GROUPING_KEY = "\n  <h3>Grouping Key</h3>\n  <p>Select the field for this datasource you want to operate the grouping strategy on.</p>\n";
     const DELIVERY_TIMEZONE = "\n  <h3>Timezone</h3>\n  <p>Select the timezone to be used for this schedule.</p>\n";
     const DELIVERY_OUTPUTS = "\n  <h3>Outputs</h3>\n  <p>Optionally select the destinations to distribute the report to.</p>\n";
 }

package/dist/dts/new/utils/tooltip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/tooltip.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,6DAElD,CAAC;AAMF,eAAO,MAAM,eAAe,0DAA0C,CAAC;AAEvE,yBAAiB,OAAO,CAAC;IAChB,MAAM,UAAU,uJAGxB,CAAC;IAEO,MAAM,cAAc,+KAI5B,CAAC;IAEO,MAAM,eAAe,8IAG7B,CAAC;IAEO,MAAM,iBAAiB,2IAG/B,CAAC;IAEO,MAAM,eAAe,ybAQ7B,CAAC;IAEO,MAAM,mBAAmB,65BAQ/B,CAAC;IAEK,MAAM,gBAAgB,uWAI9B,CAAC;IAEO,MAAM,gBAAgB,mRAG9B,CAAC;IAEO,MAAM,iBAAiB,wFAG/B,CAAC;IAEO,MAAM,gBAAgB,qGAG9B,CAAC;CACD"}
+{"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/tooltip.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,6DAElD,CAAC;AAMF,eAAO,MAAM,eAAe,0DAA0C,CAAC;AAEvE,yBAAiB,OAAO,CAAC;IAChB,MAAM,UAAU,uJAGxB,CAAC;IAEO,MAAM,cAAc,+KAI5B,CAAC;IAEO,MAAM,eAAe,8IAG7B,CAAC;IAEO,MAAM,iBAAiB,2IAG/B,CAAC;IAEO,MAAM,eAAe,ybAQ7B,CAAC;IAEO,MAAM,mBAAmB,65BAQ/B,CAAC;IAEK,MAAM,sBAAsB,sIAGpC,CAAC;IAEO,MAAM,gBAAgB,uWAI9B,CAAC;IAEO,MAAM,gBAAgB,mRAG9B,CAAC;IAEO,MAAM,6BAA6B,6dAO3C,CAAC;IAEO,MAAM,wBAAwB,6HAGtC,CAAC;IAEO,MAAM,iBAAiB,wFAG/B,CAAC;IAEO,MAAM,gBAAgB,qGAG9B,CAAC;CACD"}

package/dist/dts/new/utils/transformers.d.ts

@@ -5,5 +5,5 @@ export declare function transformToServerPayload(state: ReportingConfig): Genesi
 export declare function transformFromServerPayload(payload: Genesis.ServerReportConfig, getSchema: (name: string) => Promise<JSONSchema7>): Promise<ReportingConfig>;
 export declare function datasourceInputForDisplay(input: DatasourceInputTypes): Display.DatasourceInputTypes;
 export declare function datasourceInputFromDisplay(display: Display.DatasourceInputTypes): DatasourceInputTypes;
-export declare function buildDatasourceName(key: string, type: DatasourceInputTypes): DatasourceName;
+export declare function buildDatasourceName(alias: string, resourceName: string, type: DatasourceInputTypes): DatasourceName;
 //# sourceMappingURL=transformers.d.ts.map

package/dist/dts/new/utils/transformers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformers.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/transformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAc,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAElG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAE5C,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAiB3F;AAiCD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,CAAC,kBAAkB,EACnC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,GAChD,OAAO,CAAC,eAAe,CAAC,CAuE1B;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,oBAAoB,CAI9B;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,CAAC,oBAAoB,GACpC,oBAAoB,CAItB;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,GAAG,cAAc,CAE3F"}
+{"version":3,"file":"transformers.d.ts","sourceRoot":"","sources":["../../../../src/new/utils/transformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAc,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAElG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAE5C,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAwB3F;AAiCD,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,CAAC,kBAAkB,EACnC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,GAChD,OAAO,CAAC,eAAe,CAAC,CAoF1B;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,oBAAoB,CAI9B;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,CAAC,oBAAoB,GACpC,oBAAoB,CAItB;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,oBAAoB,GACzB,cAAc,CAEhB"}

package/dist/esm/new/main/edit-config/col-filters/col-filters-grid.helpers.js

@@ -1,4 +1,4 @@
-import { actions } from '../../../store';
+import { actions, selectors } from '../../../store';
 import { GridColumnNames, datasourceNameFromDisplay, lookupColumnIsIncluded, shouldDisableColumn, } from '../shared';
 /**
  * Handler for row selection changes in the grid
@@ -14,11 +14,13 @@ export function rowSelectionChangedHandler(event) {
         return;
     if (shouldDisableColumn(event.data))
         return;
+    const setDefaultFormat = selectors.baseConfig.getConfig().OUTPUT_FORMAT !== 'XLSX';
     actions.datasourceConfig.setColumnIncluded({
         key: datasourceNameFromDisplay(event.data[GridColumnNames.Datasource]),
         column: event.data[GridColumnNames.ColumnName],
         included: (_b = event.node.isSelected()) !== null && _b !== void 0 ? _b : true,
         type: event.data[GridColumnNames.Type],
+        setDefaultFormat,
     });
     event.api.redrawRows();
 }

package/dist/esm/new/main/edit-config/col-filters/col-filters-grid.helpers.test.js

@@ -7,6 +7,7 @@ import { rowSelectionChangedHandler } from './col-filters-grid.helpers';
 const RowSelectionChangedHandler = suite('rowSelectionChangedHandler');
 RowSelectionChangedHandler.before.each(() => {
     sinon.restore();
+    sinon.stub(selectors.baseConfig, 'getConfig').returns({ OUTPUT_FORMAT: 'CSV' });
 });
 RowSelectionChangedHandler('should return early if event.data is undefined', () => {
     const event = { data: undefined };
@@ -37,6 +38,8 @@ RowSelectionChangedHandler('should return early if filtered state matches select
         TRANSFORMER_CONFIGURATION: {
             COLUMN_FILTERS: ['testColumn'],
         },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     rowSelectionChangedHandler(mockEvent);
     assert.equal(lookupStub.called, true);
@@ -65,6 +68,8 @@ RowSelectionChangedHandler('should return early if type is invalid', () => {
         TRANSFORMER_CONFIGURATION: {
             COLUMN_FILTERS: [],
         },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     rowSelectionChangedHandler(mockEvent);
     assert.equal(lookupStub.called, true);
@@ -72,7 +77,7 @@ RowSelectionChangedHandler('should return early if type is invalid', () => {
 });
 RowSelectionChangedHandler('should update include and redraw when selection changes', () => {
     const mockData = {
-        [GridColumnNames.Datasource]: 'TEST (Snapshot)',
+        [GridColumnNames.Datasource]: 'testAlias (Snapshot)',
         [GridColumnNames.ColumnName]: 'testColumn',
         [GridColumnNames.Type]: 'INT',
     };
@@ -87,22 +92,37 @@ RowSelectionChangedHandler('should update include and redraw when selection chan
     };
     const setColumnIncludedStub = sinon.stub(actions.datasourceConfig, 'setColumnIncluded');
     sinon.stub(selectors.datasourceConfig, 'getDatasource').returns({
-        KEY: 'test',
-        NAME: 'Test Datasource',
+        KEY: 'testSource',
+        NAME: 'testAlias',
         INPUT_TYPE: 'REQ_REP',
         OUTPUT_TYPE: 'TABLE',
         TRANSFORMER_CONFIGURATION: {
             INCLUDE_COLUMNS: ['testColumn'],
         },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
+    });
+    sinon.stub(selectors.datasourceConfig, 'getAllConfigSet').returns({
+        REQ_REP_testSource_testAlias: {
+            KEY: 'testAlias',
+            NAME: 'testSource',
+            INPUT_TYPE: 'REQ_REP',
+            OUTPUT_TYPE: 'TABLE',
+            TRANSFORMER_CONFIGURATION: {},
+            GROUPING_STRATEGY: 'NONE',
+            GROUP_KEY: null,
+        },
     });
     rowSelectionChangedHandler(mockEvent);
     assert.equal(setColumnIncludedStub.calledOnce, true);
-    assert.equal(setColumnIncludedStub.getCall(0).args[0].key, 'REQ_REP_TEST');
+    assert.equal(setColumnIncludedStub.getCall(0).args[0].key, 'REQ_REP_testSource_testAlias');
     assert.equal(setColumnIncludedStub.getCall(0).args[0].column, 'testColumn');
     assert.equal(setColumnIncludedStub.getCall(0).args[0].included, false);
+    assert.equal(setColumnIncludedStub.getCall(0).args[0].setDefaultFormat, true);
     assert.equal(mockEvent.api.redrawRows.calledOnce, true);
 });
-RowSelectionChangedHandler('should handle undefined selection state', () => {
+RowSelectionChangedHandler('should not set default format if output format is XLSX', () => {
+    selectors.baseConfig.getConfig.returns({ OUTPUT_FORMAT: 'XLSX' });
     const mockData = {
         [GridColumnNames.Datasource]: 'TEST (Snapshot)',
         [GridColumnNames.ColumnName]: 'testColumn',
@@ -111,7 +131,7 @@ RowSelectionChangedHandler('should handle undefined selection state', () => {
     const mockEvent = {
         data: mockData,
         node: {
-            isSelected: sinon.stub().returns(undefined),
+            isSelected: sinon.stub().returns(false),
         },
         api: {
             redrawRows: sinon.stub(),
@@ -123,13 +143,58 @@ RowSelectionChangedHandler('should handle undefined selection state', () => {
         NAME: 'Test Datasource',
         INPUT_TYPE: 'REQ_REP',
         OUTPUT_TYPE: 'TABLE',
+        TRANSFORMER_CONFIGURATION: {
+            INCLUDE_COLUMNS: ['testColumn'],
+        },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
+    });
+    rowSelectionChangedHandler(mockEvent);
+    assert.equal(setColumnIncludedStub.calledOnce, true);
+    assert.equal(setColumnIncludedStub.getCall(0).args[0].setDefaultFormat, false);
+});
+RowSelectionChangedHandler('should handle undefined selection state', () => {
+    const mockData = {
+        [GridColumnNames.Datasource]: 'testAlias (Snapshot)',
+        [GridColumnNames.ColumnName]: 'testColumn',
+        [GridColumnNames.Type]: 'INT',
+    };
+    const mockEvent = {
+        data: mockData,
+        node: {
+            isSelected: sinon.stub().returns(undefined),
+        },
+        api: {
+            redrawRows: sinon.stub(),
+        },
+    };
+    const setColumnIncludedStub = sinon.stub(actions.datasourceConfig, 'setColumnIncluded');
+    sinon.stub(selectors.datasourceConfig, 'getDatasource').returns({
+        KEY: 'testSource',
+        NAME: 'testAlias',
+        INPUT_TYPE: 'REQ_REP',
+        OUTPUT_TYPE: 'TABLE',
         TRANSFORMER_CONFIGURATION: {
             COLUMN_FILTERS: ['testColumn'],
         },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
+    });
+    sinon.stub(selectors.datasourceConfig, 'getAllConfigSet').returns({
+        REQ_REP_testSource_testAlias: {
+            KEY: 'testAlias',
+            NAME: 'testSource',
+            INPUT_TYPE: 'REQ_REP',
+            OUTPUT_TYPE: 'TABLE',
+            TRANSFORMER_CONFIGURATION: {},
+            GROUPING_STRATEGY: 'NONE',
+            GROUP_KEY: null,
+        },
     });
     rowSelectionChangedHandler(mockEvent);
     assert.equal(setColumnIncludedStub.calledOnce, true);
     assert.equal(setColumnIncludedStub.getCall(0).args[0].included, true);
+    assert.equal(setColumnIncludedStub.getCall(0).args[0].setDefaultFormat, true);
     assert.equal(mockEvent.api.redrawRows.calledOnce, true);
 });
 RowSelectionChangedHandler.run();

package/dist/esm/new/main/edit-config/col-rename-alias/col-rename-alias-grid.helpers.test.js

@@ -21,6 +21,8 @@ LookupColumnRename('should return original data when no rename is found', () =>
         INPUT_TYPE: 'REQ_REP',
         OUTPUT_TYPE: 'TABLE',
         TRANSFORMER_CONFIGURATION: { COLUMN_RENAMES: {} },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     const result = lookupColumnRename(mockData);
     assert.equal(result, mockData);
@@ -45,6 +47,8 @@ LookupColumnRename('should return data with renamed display name when rename exi
                 [originalColumn]: newDisplayName,
             },
         },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     const result = lookupColumnRename(mockData);
     assert.equal(result[GridColumnNames.DisplayName], newDisplayName);
@@ -66,6 +70,8 @@ LookupColumnRename('should handle undefined COLUMN_RENAMES', () => {
         INPUT_TYPE: 'REQ_REP',
         OUTPUT_TYPE: 'TABLE',
         TRANSFORMER_CONFIGURATION: {},
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     const result = lookupColumnRename(mockData);
     assert.equal(result, mockData);
@@ -80,17 +86,28 @@ DisplayNameOnChangeHandler('calls setColumnRename with correct parameters when v
     const callback = sinon.spy();
     const handler = displayNameOnChangeHandler(callback);
     const mockData = {
-        [GridColumnNames.Datasource]: 'testSource (Snapshot)',
+        [GridColumnNames.Datasource]: 'testAlias (Snapshot)',
         [GridColumnNames.ColumnName]: 'originalColumn',
         [GridColumnNames.DisplayName]: 'Original Display',
         [GridColumnNames.Type]: 'STRING',
     };
     const setColumnRenameStub = sinon.stub(actions.datasourceConfig, 'setColumnRename');
+    sinon.stub(selectors.datasourceConfig, 'getAllConfigSet').returns({
+        REQ_REP_testSource_testAlias: {
+            KEY: 'testAlias',
+            NAME: 'testSource',
+            INPUT_TYPE: 'REQ_REP',
+            OUTPUT_TYPE: 'TABLE',
+            TRANSFORMER_CONFIGURATION: {},
+            GROUPING_STRATEGY: 'NONE',
+            GROUP_KEY: null,
+        },
+    });
     handler('newColumn', { data: mockData });
     assert.equal(setColumnRenameStub.calledOnce, true);
     // Check each property individually instead of using deepEqual
     const firstCallArg = setColumnRenameStub.firstCall.args[0];
-    assert.equal(firstCallArg.key, 'REQ_REP_testSource');
+    assert.equal(firstCallArg.key, 'REQ_REP_testSource_testAlias');
     assert.equal(firstCallArg.columnFrom, 'originalColumn');
     assert.equal(firstCallArg.columnTo, 'newColumn');
     assert.equal(callback.called, false);
@@ -99,17 +116,28 @@ DisplayNameOnChangeHandler('removes prohibited characters and calls callback', (
     const callback = sinon.spy();
     const handler = displayNameOnChangeHandler(callback);
     const mockData = {
-        [GridColumnNames.Datasource]: 'testSource (Snapshot)',
+        [GridColumnNames.Datasource]: 'testAlias (Snapshot)',
         [GridColumnNames.ColumnName]: 'originalColumn',
         [GridColumnNames.DisplayName]: 'Original Display',
         [GridColumnNames.Type]: 'STRING',
     };
     const setColumnRenameStub = sinon.stub(actions.datasourceConfig, 'setColumnRename');
+    sinon.stub(selectors.datasourceConfig, 'getAllConfigSet').returns({
+        REQ_REP_testSource_testAlias: {
+            KEY: 'testAlias',
+            NAME: 'testSource',
+            INPUT_TYPE: 'REQ_REP',
+            OUTPUT_TYPE: 'TABLE',
+            TRANSFORMER_CONFIGURATION: {},
+            GROUPING_STRATEGY: 'NONE',
+            GROUP_KEY: null,
+        },
+    });
     handler('new@Column-=+test', { data: mockData });
     assert.equal(setColumnRenameStub.calledOnce, true);
     // Check each property individually instead of using deepEqual
     const firstCallArg = setColumnRenameStub.firstCall.args[0];
-    assert.equal(firstCallArg.key, 'REQ_REP_testSource');
+    assert.equal(firstCallArg.key, 'REQ_REP_testSource_testAlias');
     assert.equal(firstCallArg.columnFrom, 'originalColumn');
     assert.equal(firstCallArg.columnTo, 'newColumntest');
     assert.equal(callback.calledOnce, true);

package/dist/esm/new/main/edit-config/data-transforms-derived-fields/data-transforms.helpers.test.js

@@ -20,6 +20,8 @@ LookupColumnFormat('should return empty string when no format is found', () => {
         INPUT_TYPE: 'REQ_REP',
         OUTPUT_TYPE: 'TABLE',
         TRANSFORMER_CONFIGURATION: { COLUMN_FORMATS: {} },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     const result = lookupColumnFormat(mockData);
     assert.equal(result[GridColumnNames.Format], ''); // No format found, returns empty string
@@ -44,6 +46,8 @@ LookupColumnFormat('should return data with format when format exists', () => {
                 [originalColumn]: newFormat,
             },
         },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     const result = lookupColumnFormat(mockData);
     assert.equal(result[GridColumnNames.Format], newFormat);
@@ -65,6 +69,8 @@ LookupColumnFormat('should handle undefined COLUMN_FORMATS', () => {
         INPUT_TYPE: 'REQ_REP',
         OUTPUT_TYPE: 'TABLE',
         TRANSFORMER_CONFIGURATION: {},
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     const result = lookupColumnFormat(mockData);
     assert.equal(result[GridColumnNames.Format], ''); // No format found, returns empty string
@@ -87,6 +93,8 @@ LookupColumnFormat('should return existing format when format exists', () => {
                 numericColumn: '#.##',
             },
         },
+        GROUPING_STRATEGY: 'NONE',
+        GROUP_KEY: null,
     });
     const result = lookupColumnFormat(mockData);
     assert.equal(result[GridColumnNames.Format], '#.##'); // Existing format is returned
@@ -363,7 +371,7 @@ ValueExprCellRendereronChange.before.each(() => {
     sinon.restore();
 });
 ValueExprCellRendereronChange('should call setColumnTransform when model exists', () => {
-    const datasourceKey = 'REQ_REP_Test';
+    const datasourceKey = 'REQ_REP_RESOURCE_ALIAS';
     const columnName = 'testColumn';
     // Using type assertions to match the expected type
     const mockExpression = {
@@ -403,7 +411,7 @@ ValueExprCellRendereronChange('should call setColumnTransform when model exists'
     assert.equal(deleteColumnTransformStub.called, false);
 });
 ValueExprCellRendereronChange('should call deleteColumnTransform when model is null', () => {
-    const datasourceKey = 'REQ_REP_Test';
+    const datasourceKey = 'REQ_REP_RESOURCE_ALIAS';
     const columnName = 'testColumn';
     const mockParams = {
         data: {

package/dist/esm/new/main/edit-config/datasource-config/datasource-config-item.js

@@ -1,8 +1,8 @@
 import { __awaiter, __decorate } from "tslib";
 import { Connect } from '@genesislcap/foundation-comms';
 import { attr, customElement, GenesisElement, observable } from '@genesislcap/web-core';
-import { actions, } from '../../../store';
-import { buildDatasourceName, datasourceInputFromDisplay, getDatasourceSchema, showNotificationToast, } from '../../../utils';
+import { actions, selectors, } from '../../../store';
+import { buildDatasourceName, datasourceInputFromDisplay, generateUniqueAlias, getDatasourceSchema, showNotificationToast, } from '../../../utils';
 import { setDefaultFormatsForDatasource } from '../data-transforms-derived-fields/data-transforms.helpers';
 import { styles } from './datasource-config-item.styles';
 import { template } from './datasource-config-item.template';
@@ -12,10 +12,27 @@ let DatasourceConfigItem = class DatasourceConfigItem extends GenesisElement {
         this.getSchema = getDatasourceSchema(this.connect);
         this.datasourceName = null;
         this.datasourceChoices = null;
+        this.groupingByFieldsNames = null;
         this.canRemove = false;
         this.position = 'below';
         this.error = 'none';
     }
+    connectedCallback() {
+        const _super = Object.create(null, {
+            connectedCallback: { get: () => super.connectedCallback }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            _super.connectedCallback.call(this);
+            try {
+                const datasource = selectors.datasourceConfig.getDatasource(this.datasourceName);
+                const schema = yield this.getSchema(datasource.NAME);
+                this.groupingByFieldsNames = Object.keys(schema.properties);
+            }
+            catch (e) {
+                console.error(e);
+            }
+        });
+    }
     deleteDatasourceHandler() {
         if (!this.canRemove)
             throw new Error('Trying to remove final datasource!');
@@ -25,13 +42,28 @@ let DatasourceConfigItem = class DatasourceConfigItem extends GenesisElement {
             key: this.datasourceName,
         });
     }
-    updateKeyHandler(newKey) {
+    updateKeyHandler(newName, event) {
         if (!this.datasourceName) {
             throw new Error('updateKeyHandler - datasourceName unset');
         }
-        actions.datasourceConfig.updateDatasourceKey({
+        const allDatasources = selectors.datasourceConfig.getAllConfigSet();
+        const nameExists = Object.entries(allDatasources)
+            .filter(([key]) => key !== this.datasourceName)
+            .some(([, ds]) => ds.KEY.toLowerCase() === newName.toLowerCase());
+        if (nameExists) {
+            showNotificationToast({
+                title: 'Reporting Config',
+                body: `Name '${newName}' is already in use by another datasource.`,
+                toast: { type: 'error' },
+            });
+            if (event) {
+                event.target.value = allDatasources[this.datasourceName].KEY;
+            }
+            return;
+        }
+        actions.datasourceConfig.renameDatasource({
             key: this.datasourceName,
-            newKey,
+            newName,
         });
     }
     updateOutputTypeHandler(newType) {
@@ -43,6 +75,45 @@ let DatasourceConfigItem = class DatasourceConfigItem extends GenesisElement {
             newType,
         });
     }
+    updateGroupingStrategyHandler(value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (value === 'NONE') {
+                    actions.datasourceConfig.deleteGrouping({ key: this.datasourceName });
+                    return;
+                }
+                const dsResource = selectors.datasourceConfig.getDatasource(this.datasourceName).NAME;
+                const schema = yield this.getSchema(dsResource);
+                if (!schema.properties)
+                    throw new Error(`schema properties for ${dsResource} undefined`);
+                const fields = Object.keys(schema.properties);
+                actions.datasourceConfig.setGrouping({
+                    key: this.datasourceName,
+                    grouping: { GROUPING_STRATEGY: value, GROUP_KEY: fields[0] },
+                });
+                this.groupingByFieldsNames = Object.keys(schema.properties);
+            }
+            catch (e) {
+                const errorMsg = e instanceof Error ? `\n\n${e.message}` : '';
+                showNotificationToast({
+                    title: 'Reporting Config',
+                    body: `Error fetching field data for datasource ${this.datasourceName}.${errorMsg}`,
+                    toast: { type: 'critical' },
+                });
+                this.error = 'unknown';
+                console.error(e);
+            }
+        });
+    }
+    updateGroupingByHandler(value) {
+        const datasource = selectors.datasourceConfig.getDatasource(this.datasourceName);
+        if (datasource.GROUPING_STRATEGY === 'NONE')
+            throw new Error('Cannot set group by field when GROUPING_STRATEGY is NONE');
+        actions.datasourceConfig.setGrouping({
+            key: this.datasourceName,
+            grouping: { GROUPING_STRATEGY: datasource.GROUPING_STRATEGY, GROUP_KEY: value },
+        });
+    }
     updateDatasourceSourceHandler(selectedOption) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -54,7 +125,7 @@ let DatasourceConfigItem = class DatasourceConfigItem extends GenesisElement {
                     return;
                 }
                 const option = selectedOption.selectedOptions[0];
-                const KEY = option.value;
+                const RESOURCE_NAME = option.value;
                 const dataAttr = (option.getAttribute('data-bubble-content'));
                 if (!dataAttr)
                     throw new Error(`Unable to read datasource from attribute ${dataAttr}`);
@@ -62,21 +133,37 @@ let DatasourceConfigItem = class DatasourceConfigItem extends GenesisElement {
                 if (!this.datasourceName || !INPUT_TYPE) {
                     throw new Error('updateKeyHandler - datasourceName or INPUT_TYPE null');
                 }
-                const schema = yield this.getSchema(KEY);
+                const schema = yield this.getSchema(RESOURCE_NAME);
                 if (!schema.properties)
-                    throw new Error(`schema properties for ${KEY} undefined`);
+                    throw new Error(`schema properties for ${RESOURCE_NAME} undefined`);
                 const fields = Object.keys(schema.properties);
+                // Check for duplicate aliases
+                const allDatasources = selectors.datasourceConfig.getAllConfigSet();
+                const existingAliases = new Set(Object.entries(allDatasources)
+                    .filter(([key]) => key !== this.datasourceName)
+                    .map(([, ds]) => ds.KEY));
+                const uniqueAlias = generateUniqueAlias(RESOURCE_NAME, existingAliases);
+                // Preserve index
+                const originalIndex = Object.keys(allDatasources).indexOf(this.datasourceName);
                 actions.datasourceConfig.deleteDatasource({ key: this.datasourceName });
                 actions.datasourceConfig.initDatasourceConfiguration({
                     base: {
-                        KEY,
+                        KEY: uniqueAlias,
+                        NAME: RESOURCE_NAME,
                         INPUT_TYPE: INPUT_TYPE,
                     },
                     fields,
                 });
-                const datasourceName = buildDatasourceName(KEY, INPUT_TYPE);
+                const datasourceName = buildDatasourceName(uniqueAlias, RESOURCE_NAME, INPUT_TYPE);
+                if (originalIndex !== -1) {
+                    actions.datasourceConfig.reorderDatasource({
+                        key: datasourceName,
+                        newIndex: originalIndex,
+                    });
+                }
                 setDefaultFormatsForDatasource(datasourceName, schema);
                 this.error = 'none';
+                this.groupingByFieldsNames = Object.keys(schema.properties);
             }
             catch (e) {
                 const errorMsg = e instanceof Error ? `\n\n${e.message}` : '';
@@ -100,6 +187,9 @@ __decorate([
 __decorate([
     observable
 ], DatasourceConfigItem.prototype, "datasourceChoices", void 0);
+__decorate([
+    observable
+], DatasourceConfigItem.prototype, "groupingByFieldsNames", void 0);
 __decorate([
     attr({ mode: 'boolean', attribute: 'can-remove' })
 ], DatasourceConfigItem.prototype, "canRemove", void 0);

package/dist/esm/new/main/edit-config/datasource-config/datasource-config-item.styles.js

@@ -8,6 +8,12 @@ export const styles = css `
     gap: calc(var(--design-unit) * 2px);
   }
 
+  div.split {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: calc(var(--design-unit) * 2px);
+  }
+
   rapid-combobox.datasource {
     margin-bottom: calc(var(--design-unit) * 2px);
   }

package/dist/esm/new/main/edit-config/datasource-config/datasource-config-item.template.js

@@ -1,15 +1,42 @@
 import { classNames, html, repeat, when, whenElse } from '@genesislcap/web-core';
-import { datasourceOutputs, selectors } from '../../../store';
+import { datasourceGroupingStrategies, datasourceOutputs, selectors, } from '../../../store';
 import { datasourceInputForDisplay, TOOLTIP, tooltip } from '../../../utils';
 const datasourceAlias = html `
   <div>
     <p class="label">Name${tooltip(TOOLTIP.DATASOURCES_NAME)}</p>
     <rapid-text-field
       value=${(x) => selectors.datasourceConfig.getDatasource(x.datasourceName).KEY}
-      @change=${(x, ctx) => x.updateKeyHandler(ctx.event.target.value)}
+      @change=${(x, ctx) => x.updateKeyHandler(ctx.event.target.value, ctx.event)}
     ></rapid-text-field>
   </div>
 `;
+const groupingType = html `
+  <div class="split">
+    <div>
+      <p class="label">Grouping Strategy${tooltip(TOOLTIP.DATASOURCES_GROUPING_STRATEGY)}</p>
+      <rapid-select
+        :value=${(x) => selectors.datasourceConfig.getDatasource(x.datasourceName).GROUPING_STRATEGY}
+        @change=${(x, ctx) => x.updateGroupingStrategyHandler(ctx.event.target.value)}
+      >
+        ${repeat(() => datasourceGroupingStrategies, html `
+            <rapid-option>${(x) => x}</rapid-option>
+          `)}
+      </rapid-select>
+    </div>
+    <div>
+      <p class="label">Grouping Key${tooltip(TOOLTIP.DATASOURCES_GROUPING_KEY)}</p>
+      <rapid-select
+        :value=${(x) => selectors.datasourceConfig.getDatasource(x.datasourceName).GROUP_KEY}
+        @change=${(x, ctx) => x.updateGroupingByHandler(ctx.event.target.value)}
+        ?disabled=${(x) => selectors.datasourceConfig.getDatasource(x.datasourceName).GROUPING_STRATEGY === 'NONE'}
+      >
+        ${repeat((x) => { var _a; return (_a = x.groupingByFieldsNames) !== null && _a !== void 0 ? _a : []; }, html `
+            <rapid-option>${(x) => x}</rapid-option>
+          `)}
+      </rapid-select>
+    </div>
+  </div>
+`;
 const processType = html `
   <div>
     <p class="label">Type${tooltip(TOOLTIP.DATASOURCES_TYPE)}</p>
@@ -33,6 +60,9 @@ const closeButton = html `
 const component = html `
   ${when((x) => x.canRemove, closeButton)}
   <div class="container">
+<div class="${() => classNames(['split', Boolean(selectors.baseConfig.getConfig().DOCUMENT_TEMPLATE_ID)])}">
+<div>
+    <p class="label">Datasource${tooltip(TOOLTIP.DATASOURCES_DATASOURCE)}</p>
     <rapid-combobox
       class="datasource ${(x) => classNames(['error', x.error !== 'none'])}"
       autocomplete="both"
@@ -50,7 +80,12 @@ const component = html `
           </rapid-option>
         `)}
     </rapid-combobox>
-    ${when((_) => Boolean(selectors.baseConfig.getConfig().DOCUMENT_TEMPLATE_ID), datasourceAlias)}
+</div>
+    ${when((_) => Boolean(selectors.baseConfig.getConfig().DOCUMENT_TEMPLATE_ID) ||
+    selectors.baseConfig.getConfig().OUTPUT_FORMAT !== 'CSV', datasourceAlias)}
+</div>
+</div>
+    ${when((_) => Boolean(selectors.baseConfig.getConfig().DOCUMENT_TEMPLATE_ID), groupingType)}
     <!-- ${when((_) => selectors.baseConfig.getConfig().OUTPUT_FORMAT === 'CSV', processType)} -->
   </div>
 `;