@genesislcap/blank-app-seed 3.30.0-prerelease.49 → 3.30.0-prerelease.50

package/.genx/package.json

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

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

@@ -23,13 +23,12 @@ import { gridOptions } from './{{kebabCase tile.title}}.gridOptions';
 {{/if}}
 
 {{#ifAny tile.metadata.comment tile.metadata.todo}}
-/*
-{{#if tile.metadata.comment}}{{{ tile.metadata.comment }}}{{/if}}
-{{~#if tile.metadata.todo}}{{#if tile.metadata.comment}}
-
-{{/if}}
-TODO: {{{ tile.metadata.todo }}}{{/if}}
-*/
+/**
+{{~#if tile.metadata.comment}}{{{ tile.metadata.comment }}}{{/if}}
+{{~#if tile.metadata.todo}}{{#if tile.metadata.comment}} 
+ *{{/if}}
+ * TODO: {{{ tile.metadata.todo }}}{{/if}}
+ */
 {{/ifAny}}
 
 @Component({

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

@@ -26,13 +26,12 @@ import { gridOptions as gridOptionsTile } from './{{pascalCase tile.title}}GridO
 import './{{pascalCase tile.title}}Component.css';
 
 {{#ifAny tile.metadata.comment tile.metadata.todo}}
-/*
-{{#if tile.metadata.comment}}{{{ tile.metadata.comment }}}{{/if}}
-{{~#if tile.metadata.todo}}{{#if tile.metadata.comment}}
-
-{{/if}}
-TODO: {{{ tile.metadata.todo }}}{{/if}}
-*/
+/**
+{{~#if tile.metadata.comment}}{{{ tile.metadata.comment }}}{{/if}}
+{{~#if tile.metadata.todo}}{{#if tile.metadata.comment}} 
+ *{{/if}}
+ * TODO: {{{ tile.metadata.todo }}}{{/if}}
+ */
 {{/ifAny}}
 
 export const {{pascalCase tile.componentName}}: React.FC = () => {

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

@@ -4,13 +4,12 @@ import { {{pascalCase tile.title}}Styles as styles } from './{{kebabCase tile.ti
 import { {{pascalCase tile.title}}Template as template } from './{{kebabCase tile.title}}.template';
 
 {{#ifAny tile.metadata.comment tile.metadata.todo}}
-/*
-{{#if tile.metadata.comment}}{{{ tile.metadata.comment }}}{{/if}}
-{{~#if tile.metadata.todo}}{{#if tile.metadata.comment}}
-
-{{/if}}
-TODO: {{{ tile.metadata.todo }}}{{/if}}
-*/
+/**
+{{~#if tile.metadata.comment}}{{{ tile.metadata.comment }}}{{/if}}
+{{~#if tile.metadata.todo}}{{#if tile.metadata.comment}} 
+ *{{/if}}
+ * TODO: {{{ tile.metadata.todo }}}{{/if}}
+ */
 {{/ifAny}}
 
 @customElement({

package/.genx/utils/formatRouteData.js

@@ -3,6 +3,7 @@ const {
   gridColumnsSerializer,
 } = require('./gridSerializers');
 const formatJSONValue = require('./formatJSONValue');
+const { getFormattedComment, getFormattedTodo } = require('./getTodosAndComments')
 const getLayoutType = require('./getLayoutType');
 const { COMPONENT_TYPE, FRAMEWORK_ANGULAR_ALIAS } = require('../static');
 
@@ -19,8 +20,12 @@ const formatRouteData = (framework, route) => {
   );
   const tiles = route.tiles?.map((tile, index) => {
     const config = tile.config || {};
+    const metadata = tile.metadata || {};
     const componentType = COMPONENT_TYPE[tile.type];
     const componentName = `${route.name}-${tile.title.replace(/[^0-9a-z]/gi, '')}-${componentType}`;
+    const todo = metadata?.todo && getFormattedTodo(metadata.todo);
+    const comment = metadata?.comment && getFormattedComment(metadata.comment);
+
     const {
       gridOptions,
       createFormUiSchema,
@@ -43,6 +48,11 @@ const formatRouteData = (framework, route) => {
         uischema: formatJSONValue(uischema),
         columns: gridColumnsSerializer(columns),
       },
+      metadata: {
+        ...metadata,
+        todo,
+        comment
+      }
     };
   });
 

package/.genx/utils/getTodosAndComments.js

@@ -0,0 +1,28 @@
+const MAX_LINE_LENGTH = 100;
+
+const wrapText = (text, pad = "  ") => {
+    let currentLength = 0;
+    const formattedText = text.split(" ").map((singleWord) => {
+        const lineLength = currentLength + singleWord.length + 1;
+        if(lineLength <= MAX_LINE_LENGTH) {
+            currentLength = lineLength;
+            return singleWord
+        } else {
+            currentLength = 0;
+            return `\n *${pad}${singleWord}`
+        }
+    }).join(" ")
+
+    return formattedText;
+}
+
+const getFormattedTodo = (todo) => 
+    todo.split(/\r?\n/).map((x, index)=> `${index > 0 ? '\n * ' : ''}${wrapText(x.trim())}`).join('');
+
+const getFormattedComment = (comment) => 
+    comment.split(/\r?\n/).map(x => `\n * ${wrapText(x.trim(), " ")}`).join('');
+
+module.exports = {
+    getFormattedComment,
+    getFormattedTodo
+};

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.30.0-prerelease.50](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.30.0-prerelease.49...v3.30.0-prerelease.50) (2024-11-27)
+
+
+### Bug Fixes
+
+* align UI todo/comment code generation output with server code GENC-898 (#394) 7b4b3fa
+
 ## [3.30.0-prerelease.49](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.30.0-prerelease.48...v3.30.0-prerelease.49) (2024-11-27)
 
 

package/package.json

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