@rxap/schematic-angular 16.2.0-dev.9 → 16.3.0-dev.0

package/src/schematics/table/table-component/template.schema.json

@@ -3,24 +3,18 @@
   "$id": "table-component-schematic",
   "allOf": [
     {
-      "$ref": "../../angular.schema.json"
+      "$ref": "#/definitions/angular"
     },
     {
-      "$ref": "../../table.schema.json"
+      "$ref": "#/definitions/table"
     }
   ],
   "definitions": {
-    "type": {
-      "$ref": "../../type.schema.json"
-    },
-    "property": {
-      "$ref": "../../property.schema.json"
-    },
-    "button": {
-      "$ref": "../../button.schema.json"
+    "angular": {
+      "$ref": "../../angular.schema.json"
     },
-    "upstream": {
-      "$ref": "../../upstream.schema.json"
+    "table": {
+      "$ref": "../../table.schema.json"
     }
   }
 }

package/src/schematics/table/table-header-button/schema.json

@@ -3,45 +3,27 @@
   "$id": "table-header-button-schematic",
   "allOf": [
     {
+      "$ref": "#/definitions/angular"
+    },
+    {
+      "$ref": "#/definitions/headerButton"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "tableName": {
+          "alias": "table",
+          "type": "string",
+          "description": "The name of the table action"
+        }
+      }
+    }
+  ],
+  "definitions": {
+    "angular": {
       "allOf": [
         {
-          "type": "object",
-          "properties": {
-            "project": {
-              "type": "string",
-              "description": "Project name where the files should be generated"
-            },
-            "feature": {
-              "type": "string",
-              "description": "Feature name where the files should be generated"
-            },
-            "overwrite": {
-              "anyOf": [
-                {
-                  "type": "boolean"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ],
-              "description": "Overwrite existing files",
-              "default": false
-            },
-            "overwriteHtml": {
-              "type": "boolean",
-              "default": false
-            },
-            "replace": {
-              "type": "boolean",
-              "default": false
-            }
-          },
-          "required": [
-            "project"
-          ]
+          "$ref": "#/definitions/general"
         },
         {
           "type": "object",
@@ -64,15 +46,7 @@
               "type": "string"
             },
             "backend": {
-              "type": "string",
-              "description": "The backend that should be used to handel data",
-              "enum": [
-                "none",
-                "nestjs",
-                "open-api",
-                "local"
-              ],
-              "default": "none"
+              "$ref": "#/definitions/backend"
             },
             "directory": {
               "type": "string",
@@ -97,7 +71,55 @@
         }
       ]
     },
-    {
+    "backend": {
+      "type": "string",
+      "description": "The backend that should be used to handel data",
+      "enum": [
+        "none",
+        "nestjs",
+        "open-api",
+        "local",
+        "data-source"
+      ],
+      "default": "none"
+    },
+    "general": {
+      "type": "object",
+      "properties": {
+        "project": {
+          "type": "string",
+          "description": "Project name where the files should be generated"
+        },
+        "feature": {
+          "type": "string",
+          "description": "Feature name where the files should be generated"
+        },
+        "overwrite": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ],
+          "description": "Overwrite existing files",
+          "default": false
+        },
+        "overwriteHtml": {
+          "type": "boolean",
+          "default": false
+        },
+        "replace": {
+          "type": "boolean",
+          "default": false
+        }
+      }
+    },
+    "headerButton": {
       "type": "object",
       "properties": {
         "permission": {
@@ -136,107 +158,6 @@
           "additionalProperties": true
         }
       }
-    },
-    {
-      "type": "object",
-      "properties": {
-        "tableName": {
-          "alias": "table",
-          "type": "string",
-          "description": "The name of the table action"
-        }
-      }
-    }
-  ],
-  "definitions": {
-    "type": {
-      "oneOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "isTypeOnly": {
-              "type": "boolean"
-            },
-            "moduleSpecifier": {
-              "type": "string"
-            },
-            "namedImport": {
-              "type": "string"
-            },
-            "namespaceImport": {
-              "type": "string"
-            },
-            "defaultImport": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "name"
-          ]
-        }
-      ]
-    },
-    "property": {
-      "oneOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "type": {
-              "$ref": "#/definitions/type"
-            }
-          },
-          "required": [
-            "name"
-          ]
-        }
-      ],
-      "definitions": {
-        "type": {
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "isTypeOnly": {
-                  "type": "boolean"
-                },
-                "moduleSpecifier": {
-                  "type": "string"
-                },
-                "namedImport": {
-                  "type": "string"
-                },
-                "namespaceImport": {
-                  "type": "string"
-                },
-                "defaultImport": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "name"
-              ]
-            }
-          ]
-        }
-      }
     }
   }
 }

package/src/schematics/table/table-header-button/template.schema.json

@@ -3,10 +3,10 @@
   "$id": "table-header-button-schematic",
   "allOf": [
     {
-      "$ref": "../../angular.schema.json"
+      "$ref": "#/definitions/angular"
     },
     {
-      "$ref": "../../header-button.schema.json"
+      "$ref": "#/definitions/headerButton"
     },
     {
       "type": "object",
@@ -20,11 +20,11 @@
     }
   ],
   "definitions": {
-    "type": {
-      "$ref": "../../type.schema.json"
+    "angular": {
+      "$ref": "../../angular.schema.json"
     },
-    "property": {
-      "$ref": "../../property.schema.json"
+    "headerButton": {
+      "$ref": "../../header-button.schema.json"
     }
   }
 }

package/src/schematics/table/templates/boolean-table-column.hbs

@@ -1,10 +1,23 @@
-<ng-container matColumnDef="{{column.name}}">
-  <th mat-header-cell *matHeaderCellDef mat-sort-header>
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
     <ng-container i18n>{{column.title}}</ng-container>
   </th>
+  {{/if}}
   <td *matCellDef="let element"
     mat-cell
-    {{#if column.cssClass}}class="{{column.cssClass}}"{{/if~}}
-    [rxap-boolean-cell]="element?.{{column.propertyPath}}">
+    [rxap-boolean-cell]="element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}}"
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
   </td>
-</ng-container>
+{{/matColumnDef}}

package/src/schematics/table/templates/component-table-column.hbs

@@ -1,12 +1,25 @@
-<ng-container matColumnDef="{{column.name}}">
-  <th mat-header-cell *matHeaderCellDef mat-sort-header>
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
     <ng-container i18n>{{column.title}}</ng-container>
   </th>
+  {{/if}}
   <td *matCellDef="let element"
     mat-cell
-    {{#if column.cssClass}}class="{{column.cssClass}}"{{/if~}}
-    {{prefix}}-{{column.name}}-cell
+    {{prefix}}-{{dasherize column.name}}-cell
     [element]="element"
-    [value]="element?.{{column.propertyPath}}">
+    [value]="element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}}"
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
   </td>
-</ng-container>
+{{/matColumnDef}}

package/src/schematics/table/templates/copy-to-clipboard-table-column.hbs

@@ -1,10 +1,23 @@
-<ng-container matColumnDef="{{column.name}}">
-  <th mat-header-cell *matHeaderCellDef mat-sort-header>
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
     <ng-container i18n>{{column.title}}</ng-container>
   </th>
+  {{/if}}
   <td *matCellDef="let element"
     mat-cell
-    {{#if column.cssClass}}class="{{column.cssClass}}"{{/if~}}
-    [rxap-copy-to-clipboard-cell]="element?.{{column.propertyPath}}">
+    [rxap-copy-to-clipboard-cell]="element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}}"
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
   </td>
-</ng-container>
+{{/matColumnDef}}

package/src/schematics/table/templates/custom-table-column.hbs

@@ -0,0 +1,23 @@
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
+    <ng-container i18n>{{column.title}}</ng-container>
+  </th>
+  {{/if}}
+  <td *matCellDef="let element"
+      mat-cell
+      {{#if column.cssClass}}
+      {{> cssClass cssClass=column.cssClass}}
+      {{/if}}
+  >
+  {{ column.html }}
+  </td>
+{{/matColumnDef}}

package/src/schematics/table/templates/date-table-column.hbs

@@ -1,11 +1,24 @@
-<ng-container matColumnDef="{{column.name}}">
-  <th mat-header-cell *matHeaderCellDef mat-sort-header>
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
     <ng-container i18n>{{column.title}}</ng-container>
   </th>
+  {{/if}}
   <td *matCellDef="let element"
     mat-cell
-    {{#if column.cssClass}}class="{{column.cssClass}}"{{/if~}}
     format="{{column.format}}"
-    [rxap-date-cell]="element?.{{column.propertyPath}}">
+    [rxap-date-cell]="element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}}"
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
   </td>
-</ng-container>
+{{/matColumnDef}}

package/src/schematics/table/templates/default-table-column.hbs

@@ -1,8 +1,23 @@
-<ng-container matColumnDef="{{column.name}}">
-  <th mat-header-cell *matHeaderCellDef mat-sort-header>
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
     <ng-container i18n>{{column.title}}</ng-container>
   </th>
-  <td *matCellDef="let element" mat-cell{{#if column.cssClass}} class="{{column.cssClass}}"{{/if}}>
-  \{{ element?.{{column.propertyPath}}{{#each column.pipeList}} | {{this.name}}{{/each}} }}
+  {{/if}}
+  <td *matCellDef="let element"
+      mat-cell
+      {{#if column.cssClass}}
+      {{> cssClass cssClass=column.cssClass}}
+      {{/if}}
+  >
+  \{{ element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}} }}
   </td>
-</ng-container>
+{{/matColumnDef}}

package/src/schematics/table/templates/icon-table-column.hbs

@@ -1,10 +1,23 @@
-<ng-container matColumnDef="{{column.name}}">
-  <th mat-header-cell *matHeaderCellDef mat-sort-header>
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
     <ng-container i18n>{{column.title}}</ng-container>
   </th>
+  {{/if}}
   <td *matCellDef="let element"
     mat-cell
-    {{#if column.cssClass}}class="{{column.cssClass}}"{{/if~}}
-    [rxap-icon-cell]="element?.{{column.propertyPath}}">
+    [rxap-icon-cell]="element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}}"
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
   </td>
-</ng-container>
+{{/matColumnDef}}

package/src/schematics/table/templates/link-table-column.hbs

@@ -1,10 +1,23 @@
-<ng-container matColumnDef="{{column.name}}">
-  <th mat-header-cell *matHeaderCellDef mat-sort-header>
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
     <ng-container i18n>{{column.title}}</ng-container>
   </th>
+  {{/if}}
   <td *matCellDef="let element"
     mat-cell
-    {{#if column.cssClass}}class="{{column.cssClass}}"{{/if}}
-    [rxap-link-cell]="element?.{{column.propertyPath}}">
+    [rxap-link-cell]="element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}}"
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
   </td>
-</ng-container>
+{{/matColumnDef}}

package/src/schematics/table/templates/mat-column-def.hbs

@@ -0,0 +1,3 @@
+<ng-container matColumnDef="{{#if columnName}}{{columnName}}{{/if}}{{#unless columnName}}{{column.name}}{{/unless}}"{{#if column.stickyStart}} [sticky]="true"{{/if}}{{#if column.stickyEnd}} [stickyEnd]="true"{{/if}}>
+  {{> @partial-block }}
+</ng-container>

package/src/schematics/table/templates/options-table-column.hbs

@@ -0,0 +1,26 @@
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  >
+    <ng-container i18n>{{column.title}}</ng-container>
+  </th>
+  {{/if}}
+  <td *matCellDef="let element"
+    mat-cell
+    [rxap-options-cell]="element?.{{column.propertyPath}}{{> pipe pipeList=column.pipeList}}"
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
+  {{#each column.optionList}}
+  <mat-option [value]="{{propertyValue this.value}}" i18n>{{this.display}}</mat-option>
+  {{/each}}
+  </td>
+{{/matColumnDef}}

package/src/schematics/table/templates/spinner-table-column.hbs

@@ -0,0 +1,27 @@
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+    *matHeaderCellDef
+    {{#if column.sortable}}
+    mat-sort-header
+    {{/if}}
+    {{#if column.headerCssClass}}
+    {{> cssClass cssClass=column.headerCssClass}}
+    {{/if}}
+  ></th>
+  {{/if}}
+  <td *matCellDef="let element"
+    mat-cell
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  >
+    <mat-spinner
+      *ngIf="element.__metadata__?.loading$ | async; else noSpinner"
+      diameter="15"
+    ></mat-spinner>
+    <ng-template #noSpinner>
+      <div class="w-[15px] h-[15px]"></div>
+    </ng-template>
+  </td>
+{{/matColumnDef}}

package/src/schematics/table/templates/tree-table-column.hbs

@@ -0,0 +1,21 @@
+{{#> matColumnDef column=column}}
+  {{#if table.withHeader}}
+  <th mat-header-cell
+      *matHeaderCellDef
+      {{#if column.sortable}}
+      mat-sort-header
+      {{/if}}
+      {{#if column.headerCssClass}}
+      {{> cssClass cssClass=column.headerCssClass}}
+      {{/if}}
+    ></th>
+  {{/if}}
+  <td
+    *matCellDef="let element"
+    [rxap-tree-control-cell]="element"
+    mat-cell
+    {{#if column.cssClass}}
+    {{> cssClass cssClass=column.cssClass}}
+    {{/if}}
+  ></td>
+{{/matColumnDef}}