@genesislcap/blank-app-seed 2.6.0 → 2.7.0

package/.genx/configure.js

@@ -1,5 +1,5 @@
 const versions = require('./versions.json');
-const { registerPartials, generateRoute, generateEmptyCsv } = require('./utils');
+const { registerPartials, generateRoute, generateEmptyCsv, formatRouteData } = require('./utils');
 
 /**
  * Signature is `async (data: inquirer.Answers, utils: SeedConfigurationUtils)`
@@ -14,11 +14,15 @@ module.exports = async (data, utils) => {
 
   registerPartials(utils);
 
-	data.routes
-		.map((route) => ({ ...route, layoutKey: `${route.name}_${Date.now()}` }))
-		.forEach((route) => {
-			generateRoute(route, utils);
-		});
+  data.routes
+    .forEach((route) => {
+      if (!route.name) {
+        console.warn('Invalid route - missing name', route);
+        return;
+      }
+      const routeData = formatRouteData(route);
+      generateRoute(routeData, utils);
+    });
 
   data.csv
     .map(entity => ({
@@ -28,5 +32,4 @@ module.exports = async (data, utils) => {
     .forEach(entity => {
       generateEmptyCsv(entity, data.appName, utils);
     });
-
 };

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "license": "Apache-2.0",
   "genxSeedConfig": {
     "exclude": [

package/.genx/templates/entityManager.hbs

@@ -3,16 +3,38 @@
     title="{{ config.title }}"
     {{/if}}
     resourceName="{{ config.resourceName }}"
+    {{#if config.createEvent}}
+    createEvent="{{ config.createEvent }}"
+    {{#if config.createFormUiSchema}}
+    :createFormUiSchema=${() => (
+        {{{ config.createFormUiSchema }}}
+    )}
+    {{/if}}
+    {{/if}}
     {{#if config.updateEvent}}
     updateEvent="{{ config.updateEvent }}"
+    {{#if config.updateFormUiSchema}}
+    :updateFormUiSchema=${() => (
+        {{{ config.updateFormUiSchema }}}
+    )}
+    {{/if}}
     {{/if}}
     {{#if config.deleteEvent}}
     deleteEvent="{{ config.deleteEvent }}"
     {{/if}}
-    {{#if config.createEvent}}
-    createEvent="{{ config.createEvent }}"
-    {{/if}}
     {{#if config.snapshot}}
-    :datasourceConfig="${() => ({isSnapshot: {{ config.snapshot }} })}"
+    :datasourceConfig=${() => ({isSnapshot: {{ config.snapshot }} })}
+    {{/if}}
+    {{#if config.columns}}
+    :columns=${() => {{{ config.columns }}} }
+    {{/if}}
+    {{#if config.modalPosition}}
+    modal-position="{{ config.modalPosition }}"
+    {{/if}}
+    {{#if config.sizeColumnsToFit}}
+    size-columns-to-fit
+    {{/if}}
+    {{#if config.enableSearchBar}}
+    enable-search-bar
     {{/if}}
 ></entity-management>

package/.genx/templates/form.hbs

@@ -1 +1,9 @@
-<foundation-form resourceName="{{config.resourceName}}"></foundation-form>
+<foundation-form
+  resourceName="{{config.resourceName}}"
+  {{#if config.uischema}}
+  :uischema=${() => (
+    {{{config.uischema}}}
+  )}
+  {{/if}}
+>
+</foundation-form>

package/.genx/templates/grid.hbs

@@ -4,6 +4,11 @@
     {{#if config.snapshot}}
     isSnapshot="{{config.snapshot}}"
     {{/if}}
+    {{#if config.deferredGridOptions}}
+    :deferredGridOptions=${() => (
+      {{{config.deferredGridOptions}}}
+    )}
+    {{/if}}
   >
   </grid-pro-genesis-datasource>
 </zero-grid-pro>

package/.genx/utils.js

@@ -26,9 +26,39 @@ const generateEmptyCsv = (entity, appName, { writeFileWithData }) => {
   writeFileWithData(resolve(__dirname, `../server/{{appName}}-app/src/main/genesis/data/${entity.name}.csv`), {entity}, resolve(__dirname, 'templates/csv.hbs'));
 };
 
+const formatJSONValue = (value) => {
+  try {
+    return value ? JSON.stringify(value, null, 2) : undefined;
+  } catch (e) {
+    console.warn('Could not serialise value to JSON', value, e);
+  }
+}
+
+const formatRouteData = (route) => {
+  const layoutKey = route?.layoutKey || `${route.name}_${Date.now()}`;
+  const tiles = route.tiles?.map(tile => ({
+    ...tile,
+    config: {
+      ...(tile.config || {}),
+      createFormUiSchema: formatJSONValue(tile.config?.createFormUiSchema),
+      updateFormUiSchema: formatJSONValue(tile.config?.updateFormUiSchema),
+      deferredGridOptions: formatJSONValue(tile.config?.deferredGridOptions),
+      uischema: formatJSONValue(tile.config?.uischema),
+      columns: formatJSONValue(tile.config?.columns)
+    }
+  }));
+
+  return {
+    ...route,
+    layoutKey,
+    tiles
+  }
+}
+
 module.exports = {
   makeDirectory,
   registerPartials,
   generateRoute,
   generateEmptyCsv,
+  formatRouteData,
 };

package/.github/pull_request_template.md

@@ -26,13 +26,18 @@ Add file / directory pointers.
 
 📑   **How should this be tested?**
 
+### Defaults
 
 
 ```
-npx -y @genesislcap/genx@latest init prtest -x --ref YOUR-BRANCH-NAME --no-npm
+rm -rf blankappseedtest && npx -y @genesislcap/genx@latest init blankappseedtest -x --ref YOUR-BRANCH-NAME --no-npm
 ```
 
+### Route and CSV parameter handling test
 
+```
+rm -rf blankappseedtest && npx -y @genesislcap/genx@latest init blankappseedtest --ref YOUR-BRANCH-NAME --no-npm -x --routes '[{"name":"Home","tiles":[{"title":"Entity manager","type":"entity-manager","config":{ "modalPosition": "centre", "sizeColumnsToFit": true, "enableSearchBar": true, "resourceName":"ALL_POSITIONS","title":"My Positions","updateEvent":"EVENT_COUNTERPARTY_MODIFY","deleteEvent":"EVENT_COUNTERPARTY_DELETE","createEvent":"EVENT_COUNTERPARTY_INSERT", "createFormUiSchema": {"type":"VerticalLayout","elements":[{"type":"Control","label":"Inline create schema - main contact","scope":"#/properties/MAIN_CONTACT"},{"type":"Control","label":"Issuer Name - Local Schema","scope":"#/properties/ISSUER_NAME","options":{"readonly":true}},{"type":"Control","label":"Price","scope":"#/properties/PRICE"},{"type":"Control","scope":"#/properties/COUNTERPARTY","options":{"allOptionsResourceName":"ALL_COUNTERPARTYS","valueField":"COUNTERPARTY_ID","labelField":"COUNTERPARTY_ID"}},{"type":"Control","label":"Password","scope":"#/properties/PASSWORD","options":{"isPassword":true}},{"type":"Control","label":"Password","scope":"#/properties/PASSWORD","options":{"textarea":true}}]}, "updateFormUiSchema": {"type":"VerticalLayout","elements":[{"type":"Control","label":"Inline update schema - main contact","scope":"#/properties/MAIN_CONTACT"},{"type":"Control","label":"Issuer Name - Local Schema","scope":"#/properties/ISSUER_NAME","options":{"readonly":true}},{"type":"Control","label":"Price","scope":"#/properties/PRICE"},{"type":"Control","scope":"#/properties/COUNTERPARTY","options":{"allOptionsResourceName":"ALL_COUNTERPARTYS","valueField":"COUNTERPARTY_ID","labelField":"COUNTERPARTY_ID"}},{"type":"Control","label":"Password","scope":"#/properties/PASSWORD","options":{"isPassword":true}},{"type":"Control","label":"Password","scope":"#/properties/PASSWORD","options":{"textarea":true}}]}, "columns": [{"field":"INSTRUMENT_NAME","headerName":"Instrument Name"},{"field":"VALUE","headerName":"Inline coldef - VALUE"},{"field":"QUANTITY","headerName":"Quantity"},{"field":"PNL","headerName":"PNL"}] }},{"title":"Grid","type":"grid-pro","config":{"resourceName":"ALL_TRADES", "deferredGridOptions": {"columnDefs":[{"field":"INSTRUMENT_NAME","headerName":"Instrument Name"},{"field":"VALUE","headerName":"Inline coldef - VALUE"},{"field":"QUANTITY","headerName":"Quantity"},{"field":"PNL","headerName":"PNL"}]} }},{"title":"Form","type":"smart-form","config":{"resourceName":"EVENT_COUNTERPARTY_INSERT", "uischema": {"type":"VerticalLayout","elements":[{"type":"Control","label":"Inline form schema - main contact","scope":"#/properties/MAIN_CONTACT"},{"type":"Control","label":"Issuer Name - Local Schema","scope":"#/properties/ISSUER_NAME","options":{"readonly":true}},{"type":"Control","label":"Price","scope":"#/properties/PRICE"},{"type":"Control","scope":"#/properties/COUNTERPARTY","options":{"allOptionsResourceName":"ALL_COUNTERPARTYS","valueField":"COUNTERPARTY_ID","labelField":"COUNTERPARTY_ID"}},{"type":"Control","label":"Password","scope":"#/properties/PASSWORD","options":{"isPassword":true}},{"type":"Control","label":"Password","scope":"#/properties/PASSWORD","options":{"textarea":true}}]} }}]}, {"name":"Realtime Dashboard","tiles":[{"title":"Entity manager tile","type":"entity-manager","config":{"resourceName":"ALL_COUNTERPARTYS","title":"Counterparty Management","updateEvent":"EVENT_COUNTERPARTY_MODIFY","deleteEvent":"EVENT_COUNTERPARTY_DELETE","createEvent":"EVENT_COUNTERPARTY_INSERT"}},{"title":"Form tile","type":"smart-form","config":{"resourceName":"EVENT_COUNTERPARTY_INSERT"}}]},{"name":"Analytics","tiles":[{"title":"Grid Tile","type":"grid-pro","config":{"resourceName":"ALL_POSITIONS"}},{"title":"Charts Tile 1","type":"chart","config":{"type":"line","resourceName":"ALL_POSITIONS","xField":"INSTRUMENT_NAME","yField":"VALUE"}},{"title":"Charts Tile 2","type":"chart","config":{"type":"pie","resourceName":"ALL_POSITIONS","xField":"INSTRUMENT_NAME","yField":"VALUE"}},{"title":"Charts Tile 3","type":"chart","config":{"type":"column","resourceName":"ALL_POSITIONS","xField":"INSTRUMENT_ID","yField":"VALUE"}}]}]' --csv '[{"name": "trade", "fields": ["a", "B"]}, {"name": "position", "fields": ["id", "TYPE"]} ]' --apiHost 'wss://public-foundation.genesislab.global/gwf/' --no-shell && cd blankappseedtest/client && npm run bootstrap && npm run dev
+```
 
 ✅   **Checklist**
 

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.7.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v2.6.0...v2.7.0) (2024-04-10)
+
+
+### Features
+
+* support for overriding default column definitions and form schemas GENC-242 (#176) 297c408
+
 ## [2.6.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v2.5.10...v2.6.0) (2024-04-10)
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed",
   "description": "Genesis Blank App Seed",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"