@genesislcap/blank-app-seed 3.32.0 → 3.33.0

package/.genx/configure.js

@@ -7,6 +7,7 @@ const {
   getCombinedCsvData,
   registerPartials,
   validateRoute,
+  deleteGradleWrappers,
 } = require('./utils');
 
 /**
@@ -48,4 +49,8 @@ module.exports = async (data, utils) => {
     .forEach((entity) => {
       generateCsv(entity, utils);
     });
+
+  if (data.excludeGradleWrapper) {
+    deleteGradleWrappers();
+  }
 };

package/.genx/package.json

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

package/.genx/prompts/server.js

@@ -11,6 +11,7 @@ module.exports = async (inquirer, prevAns = {}) => {
     applicationVersion = prevAns.applicationVersion,
     enableDeployPlugin = prevAns.enableDeployPlugin,
     csv = prevAns.csv,
+    excludeGradleWrapper = prevAns.excludeGradleWrapper,
   } = await inquirer.prompt([
     {
       name: 'description',
@@ -41,6 +42,13 @@ module.exports = async (inquirer, prevAns = {}) => {
       when: prevAns.enableDeployPlugin === undefined,
       default: prevAns.enableDeployPlugin || false,
     },
+    {
+      name: 'excludeGradleWrapper',
+      type: 'confirm',
+      message: TEXTS.MESSAGE_EXCLUDE_GRADLE_WRAPPER,
+      when: prevAns.excludeGradleWrapper === undefined,
+      default: prevAns.excludeGradleWrapper || false,
+    },
     {
       name: 'csv',
       type: 'input',
@@ -56,5 +64,6 @@ module.exports = async (inquirer, prevAns = {}) => {
     applicationVersion,
     enableDeployPlugin,
     csv: parsecsv(csv),
+    excludeGradleWrapper,
   };
 };

package/.genx/prompts.js

@@ -17,8 +17,14 @@ module.exports = async (inquirer, prevAns = {}) => {
   License: ${license}`);
 
   const { apiHost, enableSSO } = await apiPrompts(inquirer, prevAns);
-  const { description, groupId, applicationVersion, enableDeployPlugin, csv } =
-    await genesisServerPrompts(inquirer, prevAns);
+  const {
+    description,
+    groupId,
+    applicationVersion,
+    enableDeployPlugin,
+    csv,
+    excludeGradleWrapper,
+  } = await genesisServerPrompts(inquirer, prevAns);
   const { routes, ui, framework } = await uiPrompts(inquirer, prevAns);
 
   return {
@@ -32,5 +38,6 @@ module.exports = async (inquirer, prevAns = {}) => {
     csv,
     ui,
     framework,
+    excludeGradleWrapper,
   };
 };

package/.genx/static.js

@@ -74,6 +74,7 @@ const TEXTS = {
   MESSAGE_SERVER_GROUP_ID: 'Group Id',
   MESSAGE_SERVER_APPLICATION_VERSION: 'Application Version',
   MESSAGE_SERVER_DEPLOY_PLUGIN: 'Enable deploy plugin?',
+  MESSAGE_EXCLUDE_GRADLE_WRAPPER: 'Exclude Gradle wrapper?',
   MESSAGE_SERVER_CSV:
     'Generate empty CSV for entities? (config in JSON format)',
   MESSAGE_UI_ROTUES: 'Pages config in JSON format',

package/.genx/templates/angular/component/component.hbs

@@ -22,6 +22,18 @@ import { columnDefs } from './{{kebabCase tile.title}}.column.defs';
 import { gridOptions } from './{{kebabCase tile.title}}.gridOptions';
 {{/if}}
 
+{{#if tile.metadata.comment}}
+/*
+{{ tile.metadata.comment }}
+*/
+
+{{/if}}
+{{#if tile.metadata.todo}}
+/*
+{{ tile.metadata.todo }}
+*/
+
+{{/if}}
 @Component({
   selector: 'app-{{kebabCase tile.componentName}}',
   templateUrl: './{{kebabCase tile.title}}.component.html',

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

@@ -25,6 +25,18 @@ import { gridOptions as gridOptionsTile } from './{{pascalCase tile.title}}GridO
 {{/if}}
 import './{{pascalCase tile.title}}Component.css';
 
+{{#if tile.metadata.comment}}
+/*
+{{ tile.metadata.comment }}
+*/
+
+{{/if}}
+{{#if tile.metadata.todo}}
+/*
+{{ tile.metadata.todo }}
+*/
+
+{{/if}}
 export const {{pascalCase tile.componentName}}: React.FC = () => {
   {{#if tile.config.permissions.viewRight~}}
   const hasUserPermission = (permissionCode: string): boolean => getViewUpdateRightComponent(getUser(), permissionCode);

package/.genx/templates/react/route.hbs

@@ -1,4 +1,5 @@
 import './{{pascalCase route.name}}.css';
+import { persistLayout } from '../../utils';
 {{#each route.tiles}}
 import { {{pascalCase this.componentName}} } from './{{pascalCase this.title}}{{pascalCase this.componentType}}';
 {{/each}}
@@ -7,7 +8,7 @@ const {{pascalCase route.name}} = () => {
   return (
     <section className="{{kebabCase route.name}}-page">
       {{#if route.tiles}}
-      <rapid-layout auto-save-key={process.env.NODE_ENV === 'production' ? "{{route.layoutKey}}" : null}>
+      <rapid-layout auto-save-key={persistLayout('{{route.layoutKey}}')}>
         {{> (lookup ./route 'layoutType') }}
       </rapid-layout>
       {{else}}

package/.genx/templates/web-components/component/component.hbs

@@ -3,6 +3,18 @@ import { customElement, GenesisElement } from '@genesislcap/web-core';
 import { {{pascalCase tile.title}}Styles as styles } from './{{kebabCase tile.title}}.styles';
 import { {{pascalCase tile.title}}Template as template } from './{{kebabCase tile.title}}.template';
 
+{{#if tile.metadata.comment}}
+/*
+{{ tile.metadata.comment }}
+*/
+
+{{/if}}
+{{#if tile.metadata.todo}}
+/*
+{{ tile.metadata.todo }}
+*/
+
+{{/if}}
 @customElement({
   name: '{{kebabCase tile.componentName}}',
   template,

package/.genx/templates/web-components/route.template.hbs

@@ -1,5 +1,5 @@
-import { isDev } from '@genesislcap/foundation-utils';
 import { html } from '@genesislcap/web-core';
+import { persistLayout } from '../../utils';
 import type { {{pascalCase route.name}} } from './{{kebabCase route.name}}';
 {{#each route.tiles}}
 import { {{pascalCase this.componentName}} } from './{{kebabCase this.title}}-{{this.componentType}}';
@@ -11,7 +11,7 @@ import { {{pascalCase this.componentName}} } from './{{kebabCase this.title}}-{{
 
 export const {{pascalCase route.name}}Template = html<{{pascalCase route.name}}>`
   {{#if route.tiles}}
-  <rapid-layout auto-save-key="${() => (isDev() ? null : '{{route.layoutKey}}')}">
+  <rapid-layout auto-save-key="${() => persistLayout('{{route.layoutKey}}')}">
      {{> (lookup ./route 'layoutType') }}
   </rapid-layout>
   {{else}}

package/.genx/utils/deleteGradleWrappers.js

@@ -0,0 +1,12 @@
+const { rmdirSync } = require('node:fs');
+const { resolve } = require('node:path');
+
+const deleteGradleWrappers = (
+  paths = ['../../gradle', '../../server/gradle'],
+) => {
+  paths.forEach((p) => {
+    rmdirSync(resolve(__dirname, p), { recursive: true, force: true });
+  });
+};
+
+module.exports = deleteGradleWrappers;

package/.genx/utils/generateRoute.js

@@ -76,6 +76,7 @@ const generateRoute = (route, { changeCase, writeFileWithData }, framework) => {
 
   if (route?.tiles?.length) {
     route.tiles.forEach((tile) => {
+      tile.metadata = tile.metadata || {};
       generateTile(tile, route, { changeCase, writeFileWithData }, framework);
     });
   }

package/.genx/utils/index.js

@@ -1,4 +1,5 @@
 const excludeFrameworks = require('./excludeFrameworks');
+const deleteGradleWrappers = require('./deleteGradleWrappers');
 const formatRouteData = require('./formatRouteData');
 const generateRoute = require('./generateRoute');
 const generateCsv = require('./generateCsv');
@@ -11,6 +12,7 @@ const validateRoute = require('./validateRoute');
 const validateFrameworkAlias = require('./validateFrameworkAlias');
 
 module.exports = {
+  deleteGradleWrappers,
   excludeFrameworks,
   formatRouteData,
   generateRoute,

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.33.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.32.0...v3.33.0) (2024-10-22)
+
+
+### Features
+
+* allow excluding Gradle wrappers GENC-824 (#366) 0980ff2, closes FUI-2211 FUI-2211
+
 ## [3.32.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.31.1...v3.32.0) (2024-10-16)
 
 

package/client-tmp/react/package.json

@@ -2,6 +2,9 @@
   "name": "{{pkgName}}",
   "version": "{{applicationVersionWeb}}",
   "private": true,
+  "config": {
+    "PERSIST_LAYOUT_IN_DEV": false
+  },
   "scripts": {
     "baseline": "npm run clean && npm run bootstrap",
     "bootstrap": "npm i --legacy-peer-deps",
@@ -46,8 +49,8 @@
     "@genesislcap/foundation-layout": "{{versions.UI}}",
     "@genesislcap/g2plot-chart": "{{versions.UI}}",
     "history": "^5.3.0",
-    "react": "^19.0.0-beta-94eed63c49-20240425",
-    "react-dom": "^19.0.0-beta-94eed63c49-20240425",
+    "react": "^19.0.0-rc-ed966dac-20241007",
+    "react-dom": "^19.0.0-rc-ed966dac-20241007",
     "react-router-dom": "6.24.1",
     "web-vitals": "^2.1.4"
   },

package/client-tmp/react/src/utils/index.ts

@@ -1,4 +1,5 @@
 export * from './history';
 export * from './fdc3';
+export * from './layout';
 export * from './permissions';
 export * from './setApiHost';

package/client-tmp/react/src/utils/layout.ts

@@ -0,0 +1,11 @@
+import { isDev } from '@genesislcap/foundation-utils';
+import pkg from '../../package.json';
+
+// returning null disables caching
+// returning an id (as long as it's not null) enables caching
+export const persistLayout = (id: string) => {
+  if (isDev() && (pkg as any)?.config.PERSIST_LAYOUT_IN_DEV !== true) {
+    return null;
+  }
+  return id;
+};

package/client-tmp/web-components/package.json

@@ -7,7 +7,8 @@
   "config": {
     "API_HOST": "{{apiHost}}",
     "PORT": 6060,
-    "ENABLE_SSO": {{enableSSO}}
+    "ENABLE_SSO": {{enableSSO}},
+    "PERSIST_LAYOUT_IN_DEV": false
   },
   "genx": {
     "app": {

package/client-tmp/web-components/src/utils/index.ts

@@ -1,3 +1,4 @@
 export * from './fdc3';
+export * from './layout';
 export * from './logger';
 export * from './permissions';

package/client-tmp/web-components/src/utils/layout.ts

@@ -0,0 +1,11 @@
+import { isDev } from '@genesislcap/foundation-utils';
+import pkg from '../../package.json';
+
+// returning null disables caching
+// returning an id (as long as it's not null) enables caching
+export const persistLayout = (id: string) => {
+  if (isDev() && (pkg as any)?.config.PERSIST_LAYOUT_IN_DEV !== true) {
+    return null;
+  }
+  return id;
+};

package/client-tmp/web-components/tsconfig.json

@@ -18,7 +18,7 @@
     ],
     "declarationDir": "./dist/dts",
     "outDir": "./dist/esm",
-    "rootDir": "./src",
+    "rootDir": ".",
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "declaration": true,

package/package.json

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

package/settings.gradle.kts

@@ -1,5 +1,8 @@
-// servers
-includeBuild("server")
+val gradleFolder: File = rootProject.projectDir.resolve("gradle")
+if (gradleFolder.exists()) {
+    // servers
+    includeBuild("server")
 
-// clients
-includeBuild("client")
+    // clients
+    includeBuild("client")
+}