@genesislcap/blank-app-seed 3.28.6 → 3.29.1-prerelease.1

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "3.28.6",
+  "version": "3.29.1-prerelease.1",
   "license": "Apache-2.0",
   "scripts": {
     "lint": "eslint .",

package/.genx/scripts/update-versions.js

@@ -3,6 +3,18 @@ const { writeFileSync } = require('node:fs');
 const { resolve } = require('node:path');
 const current = require('../versions.json');
 
+const args = process.argv.slice(2);
+const patchOnly = args.indexOf("--patch-only") >= 0;
+const dryRun = args.indexOf("--dry-run") >= 0;
+
+const VERSION_REGEX = /\d+$/;
+
+const jfrogVersionMatcher = patchOnly ? current.GSF.replace(VERSION_REGEX, '*') : undefined;
+
+const npmVersionMatcher = patchOnly ? current.UI.replace(VERSION_REGEX, 'x') : 'latest';
+
+console.log('Running with: ', {patchOnly, dryRun, npmVersionMatcher, jfrogVersionMatcher})
+
 const run = (command) =>
   execSync(command, {
     stdio: ['pipe', 'pipe', 'ignore'],
@@ -20,12 +32,14 @@ const writeJSON = (json, path) => {
   }
 };
 
-const UI = run('npm info @genesislcap/foundation-ui@latest version');
+const UI = run(`npm info @genesislcap/foundation-ui@${npmVersionMatcher} version`);
+
 const GSF = run(
-  `jf rt s "libs-release-client/global/genesis/genesis-distribution/" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
+  `jf rt s "libs-release-client/global/genesis/genesis-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
 );
+
 const Auth = run(
-  `jf rt s "libs-release-client/global/genesis/auth-distribution/" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
+  `jf rt s "libs-release-client/global/genesis/auth-distribution/${jfrogVersionMatcher ?? ''}" --exclusions="*-RC*;*-SNAPSHOT*;*maven-metadata*;*test*;*TEST*" | grep path | tr -s ' ' | sed 's/"path": //g' | awk -F'/' '{print $(NF-1)}' | sort -V | tail -n 1`,
 );
 const latest = { UI, GSF, Auth };
 
@@ -35,7 +49,11 @@ console.log('Latest:', latest);
 if (current.UI !== UI || current.GSF !== GSF || current.Auth !== Auth) {
   console.log('Newer versions available');
   const path = resolve(__dirname, '../versions.json');
-  writeJSON(latest, path);
+  if (!dryRun) {
+    writeJSON(latest, path);
+  } else {
+    console.log('Dry run execution, versions will not be written.')
+  }
 } else {
   console.log('No newer versions available');
 }

package/.genx/templates/react/component/component.column.defs.hbs

@@ -0,0 +1,9 @@
+import { ColDef } from '@ag-grid-community/core';
+import { getNumberFormatter, getDateFormatter } from '@genesislcap/foundation-utils';
+{{#if route.FDC3EventHandlersEnabled}}
+import { sendEventOnChannel } from '../../../utils';
+{{/if}}
+
+{{#if tile.config.columns}}
+export const columnDefs: ColDef[] = {{{ tile.config.columns }}}
+{{/if}}

package/.genx/templates/react/component/component.create.form.hbs

@@ -0,0 +1,8 @@
+import { UiSchema } from '@genesislcap/foundation-forms';
+
+{{#if tile.config.createFormUiSchema}}
+export const createFormSchema: UiSchema = {{{ tile.config.createFormUiSchema }}}
+{{/if}}
+{{#if tile.config.uischema}}
+export const createFormSchema: UiSchema = {{{ tile.config.uischema }}}
+{{/if}}

package/.genx/templates/react/component/component.gridOptions.hbs

@@ -0,0 +1,9 @@
+import { GridOptionsConfig } from '@genesislcap/rapid-grid-pro';
+import { getNumberFormatter, getDateFormatter } from '@genesislcap/foundation-utils';
+{{#if route.FDC3EventHandlersEnabled}}
+import { sendEventOnChannel } from '../../../utils';
+{{/if}}
+
+{{#if tile.config.gridOptions}}
+export const gridOptions: GridOptionsConfig = {{{ tile.config.gridOptions }}}
+{{/if}}

package/.genx/templates/react/component/component.hbs

@@ -0,0 +1,32 @@
+import { Component, Input, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { getUser } from '@genesislcap/foundation-user';
+import { ErrorMessageComponent } from '../../../components/error-message/error-message.component';
+import { getViewUpdateRightComponent } from '../../../utils';
+{{#if tile.config.gridOptions}}
+import { GridOptionsConfig } from "@genesislcap/rapid-grid-pro";
+{{/if}}
+{{#if tile.config.createFormUiSchema}}
+import { createFormSchema } from './{{kebabCase tile.title}}.create.form.schema';
+{{/if}}
+{{#if tile.config.uischema}}
+import { createFormSchema } from './{{kebabCase tile.title}}.create.form.schema';
+{{/if}}
+{{#if tile.config.updateFormUiSchema}}
+import { updateFormSchema } from './{{kebabCase tile.title}}.update.form.schema';
+{{/if}}
+{{#if tile.config.columns}}
+import { columnDefs } from './{{kebabCase tile.title}}.column.defs';
+{{/if}}
+{{#if tile.config.gridOptions}}
+import { gridOptions } from './{{kebabCase tile.title}}.gridOptions';
+{{/if}}
+import './{{kebabCase tile.title}}.component.css';
+
+const {{pascalCase tile.componentName}} = () => {
+  return (
+    {{> (lookup tile 'type') tile}}
+  );
+};
+
+export default {{pascalCase tile.componentName}};

package/.genx/templates/react/component/component.index.hbs

@@ -0,0 +1 @@
+export * from './{{kebabCase tile.title}}.component';

package/.genx/templates/react/component/component.styles.hbs

@@ -0,0 +1,3 @@
+:host {
+  /* insert css styles here */
+}

package/.genx/templates/react/component/component.update.form.hbs

@@ -0,0 +1,5 @@
+import { UiSchema } from '@genesislcap/foundation-forms';
+
+{{#if tile.config.updateFormUiSchema}}
+export const updateFormSchema: UiSchema = {{{ tile.config.updateFormUiSchema }}}
+{{/if}}

package/.genx/utils/generateRoute.js

@@ -73,13 +73,7 @@ const generateRoute = (route, { changeCase, writeFileWithData }, framework) => {
     );
   });
 
-  // Remove condition after adding changes for react
-  if (
-    [FRAMEWORK_WEB_COMPONENTS_ALIAS, FRAMEWORK_ANGULAR_ALIAS].includes(
-      framework,
-    ) &&
-    route?.tiles?.length
-  ) {
+  if (route?.tiles?.length) {
     route.tiles.forEach((tile) => {
       generateTile(tile, route, { changeCase, writeFileWithData }, framework);
     });

package/.genx/utils/generateTile.js

@@ -3,6 +3,7 @@ const makeDirectory = require('./makeDirectory');
 const {
   FRAMEWORK_WEB_COMPONENTS_ALIAS,
   FRAMEWORK_ANGULAR_ALIAS,
+  FRAMEWORK_REACT_ALIAS,
   DIR_TEMPLATE_BY_FRAMEWORK,
 } = require('../static');
 
@@ -41,6 +42,16 @@ const getPathByFramework = {
     style: (componentPath, tile) =>
       `${componentPath}/${tile.name}.component.css`,
   },
+  [FRAMEWORK_REACT_ALIAS]: {
+    ...defaultPathGetters,
+    clientSrcPath: `../../client/src/pages`,
+    route: (clientSrcPath, tile, routeName) =>
+      `${clientSrcPath}/${routeName}/${tile.name}-${tile.componentType}`,
+    component: (componentPath, tile) =>
+      `${componentPath}/${tile.name}.component.jsx`,
+    style: (componentPath, tile) =>
+      `${componentPath}/${tile.name}.component.css`,
+  },
 };
 
 const getFilesToWrite = (tileData, routeName, path, sourceTemplateDir) => {
@@ -69,11 +80,6 @@ const getFilesToWrite = (tileData, routeName, path, sourceTemplateDir) => {
     target: getComponentTarget(routeDir, tileData),
   };
 
-  const componentTemplateFile = {
-    source: `${sourceTemplateDir}/component/component.template.hbs`,
-    target: getTemplateTarget(routeDir, tileData),
-  };
-
   const componentStylesFile = {
     source: `${sourceTemplateDir}/component/component.styles.hbs`,
     target: getStyleTarget(routeDir, tileData),
@@ -99,12 +105,14 @@ const getFilesToWrite = (tileData, routeName, path, sourceTemplateDir) => {
     target: getGridOptionsTarget(routeDir, tileData),
   };
 
-  const filesToWrite = [
-    componentIndexFile,
-    componentFile,
-    componentTemplateFile,
-    componentStylesFile,
-  ];
+  const filesToWrite = [componentIndexFile, componentFile, componentStylesFile];
+
+  if (getTemplateTarget) {
+    filesToWrite.push({
+      source: `${sourceTemplateDir}/component/component.template.hbs`,
+      target: getTemplateTarget(routeDir, tileData),
+    });
+  }
 
   switch (tileData.type) {
     case 'entity-manager':

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
   "UI": "14.200.0",
-  "GSF": "8.2.3",
+  "GSF": "8.2.4",
   "Auth": "8.2.1"
 }

package/.github/workflows/upgrade.yml

@@ -1,17 +1,35 @@
-name: Upgrade
+name: Ω Workflow - Upgrade dependencies
 
 on:
-  workflow_dispatch: # Manual
-  schedule:
-    - cron: '0 9 * * 1' # Mondays 9AM UTC
+  workflow_call:
+    inputs:
+      branch:
+        type: string
+        required: true
+        description: The branch that will be upgraded
+      patch-only:
+        type: boolean
+        required: false
+        description: Only update if there are newer patch versions
+    secrets:
+      GH_USER_TOKEN:
+        required: true
+      JFROG_LIBS_RELEASE_CLIENT_RO_USER:
+        required: true
+      JFROG_LIBS_RELEASE_CLIENT_RO_KEY:
+        required: true
 
 jobs:
   upgrade:
     runs-on: ubuntu-latest
     environment: deploy
+    env:
+      BRANCH: ${{ inputs.branch }}
+      PATCH_ARG: ${{ inputs.patch-only && '--patch-only' || '' }}
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.branch }}
           token: ${{secrets.GH_USER_TOKEN}}
 
       - name: Set up Node
@@ -29,7 +47,7 @@ jobs:
           jfrog config add --artifactory-url="https://genesisglobal.jfrog.io/artifactory" --user="${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_USER }}" --password="${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_KEY }}" --interactive=false
 
       - name: Update to latest versions if available
-        run: node .genx/scripts/update-versions
+        run: node .genx/scripts/update-versions ${PATCH_ARG}
 
       - name: Check for changes
         id: versions
@@ -39,10 +57,10 @@ jobs:
         if: steps.versions.outputs.CHANGED
         run: |
           git config --global user.email "ci@genesis.global" && git config --global user.name "CI"
-          git checkout -b chore-dep-update
+          git checkout -b chore-dep-update-${BRANCH}
           git add --all
           git commit -m "fix: automated dependency version update [skip-ci] PSD-9"
-          git push -f --set-upstream origin chore-dep-update
+          git push -f --set-upstream origin chore-dep-update-${BRANCH}
 
       - name: Raise PR
         if: steps.versions.outputs.CHANGED
@@ -64,8 +82,8 @@ jobs:
             repo = process.env.REPO,
             title = 'fix: automated dependency version update [skip-ci] PSD-9',
             body  = 'Automated PR',
-            head  = 'chore-dep-update',
-            base  = 'main';
+            head  = 'chore-dep-update-${{inputs.branch}}',
+            base  = '${{inputs.branch}}';
           
           (async () => {
             const response = await octokit.request(
@@ -75,5 +93,3 @@ jobs:
           EOT
 
           node /tmp/create-pr/index
-
-

package/.github/workflows/upgrade_main.yml

@@ -0,0 +1,19 @@
+name: Upgrade main
+
+on:
+  workflow_dispatch: # Manual
+  schedule:
+    - cron: '0 8 * * 1-5' # Weekdays 8AM UTC
+
+concurrency: upgrade-main
+
+jobs:
+  upgrade:
+    uses: ./.github/workflows/upgrade.yml
+    with: 
+      branch: main
+      patch-only: true
+    secrets:
+      GH_USER_TOKEN: ${{ secrets.GH_USER_TOKEN }}
+      JFROG_LIBS_RELEASE_CLIENT_RO_USER: ${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_USER }}
+      JFROG_LIBS_RELEASE_CLIENT_RO_KEY: ${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_KEY }}

package/.github/workflows/upgrade_prerelease.yml

@@ -0,0 +1,18 @@
+name: Upgrade prerelease
+
+on:
+  workflow_dispatch: # Manual
+  schedule:
+    - cron: '0 8 * * 1-5' # Weekdays 8AM UTC
+
+concurrency: upgrade-prerelease
+
+jobs:
+  upgrade:
+    uses: ./.github/workflows/upgrade.yml
+    with: 
+      branch: prerelease
+    secrets:
+      GH_USER_TOKEN: ${{ secrets.GH_USER_TOKEN }}
+      JFROG_LIBS_RELEASE_CLIENT_RO_USER: ${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_USER }}
+      JFROG_LIBS_RELEASE_CLIENT_RO_KEY: ${{ secrets.JFROG_LIBS_RELEASE_CLIENT_RO_KEY }}

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.29.1-prerelease.1](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.29.0...v3.29.1-prerelease.1) (2024-08-14)
+
+
+### Bug Fixes
+
+* automated dependency version update [skip-ci] [PSD-9](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/9) (#314) 5070baa
+
+## [3.29.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.28.6...v3.29.0) (2024-08-13)
+
+
+### Features
+
+* Implement the generated UI code structure proposal (react) - [FUI-2139](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/2139) (#305) 6054353
+
 ## [3.28.6](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.28.5...v3.28.6) (2024-08-12)
 
 

package/package.json

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