@abgov/nx-adsp 13.31.0 → 13.31.2

package/README.md

@@ -172,6 +172,12 @@ The generated Playwright e2e project includes an axe-core accessibility check (`
 scoped to WCAG 2.1 A/AA, that runs automatically as part of the `e2e` target — no separate command
 needed. `angular-app` and `vue-app` include the same check.
 
+Its coverage is the `ROUTES` array inside that spec, which ships as `['/']` — the only route a
+freshly generated app has. **Add to it as the app gains routes**, from a generator or by hand; no
+generator maintains the list, and `/` is mostly app shell, so it exercises little of what the app
+is actually built from. Expect genuine failures once expanded: some come from inside
+`@abgov/web-components`' shadow DOM and need an upstream fix rather than an app-side change.
+
 ---
 
 ### `angular-app`
@@ -279,7 +285,7 @@ npx nx g @abgov/nx-adsp:vue-detail-view my-app --name=application-detail --resou
 | -------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `project`      | Yes      | The `vue-app` project to add the view to                                                                                                                                                                  |
 | `name`         | Yes      | View name, e.g. `application-detail` generates `src/views/ApplicationDetailView.vue`                                                                                                                      |
-| `resource`     | Yes      | API resource path segment — the view fetches `/api/<resource>/:id`                                                                                                                                        |
+| `resource`     | Yes      | API resource path segment — the view fetches `/api/v1/<resource>/:id`                                                                                                                                     |
 | `route`        | Yes      | Route path added to `router/index.ts`, e.g. `/applications/:id`. Must contain a `:id` param                                                                                                               |
 | `fields`       | Yes      | JSON array of fields rendered in the record's info list, in display order: `{ key, label, type?: "text"\|"date"\|"currency"\|"badge" }` — a JSON string, not a comma-separated CLI array (see note below) |
 | `heading`      | No       | Page heading. Defaults to the view name, title-cased                                                                                                                                                      |
@@ -296,18 +302,19 @@ an existing `vue-app` project, built on the shared `WorkspaceTable` pattern comp
 npx nx g @abgov/nx-adsp:vue-workspace-view my-app --name=applications --resource=applications --route=/applications --detailRoute=/applications --columns='[{"key":"status","label":"Status","type":"badge","sortable":true}]'
 ```
 
-| Option         | Required | Description                                                                                                                                              |
-| -------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `project`      | Yes      | The `vue-app` project to add the view to                                                                                                                 |
-| `name`         | Yes      | View name, e.g. `applications` generates `src/views/ApplicationsListView.vue`                                                                            |
-| `resource`     | Yes      | API resource path segment — fetches `/api/<resource>?page=&limit=&search=&sortBy=&sortDir=`                                                              |
-| `route`        | Yes      | Route path added to `router/index.ts`, e.g. `/applications`                                                                                              |
-| `columns`      | Yes      | JSON array of table columns, in display order: `{ key, label, type?: "text"\|"date"\|"currency"\|"badge", sortable? }` — a JSON string (see note below)  |
-| `detailRoute`  | No       | If set, each row gets a "View" action linking to `` `${detailRoute}/${row.id}` `` — typically a `vue-detail-view`'s route with the `:id` segment dropped |
-| `filterable`   | No       | Whether to generate a debounced search input above the table. Defaults to `true`                                                                         |
-| `heading`      | No       | Page heading. Defaults to the view name, title-cased                                                                                                     |
-| `pageSize`     | No       | Rows per page. Defaults to `20`                                                                                                                          |
-| `requiresAuth` | No       | Whether the generated route requires authentication. Defaults to `true`                                                                                  |
+| Option         | Required | Description                                                                                                                                                                                                                                                                                                                                                           |
+| -------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `project`      | Yes      | The `vue-app` project to add the view to                                                                                                                                                                                                                                                                                                                              |
+| `name`         | Yes      | View name, e.g. `applications` generates `src/views/ApplicationsListView.vue`                                                                                                                                                                                                                                                                                         |
+| `resource`     | Yes      | API resource path segment — fetches `/api/v1/<resource>?page=&limit=&search=&sortBy=&sortDir=`                                                                                                                                                                                                                                                                        |
+| `route`        | Yes      | Route path added to `router/index.ts`, e.g. `/applications`                                                                                                                                                                                                                                                                                                           |
+| `columns`      | Yes      | JSON array of table columns, in display order: `{ key, label, type?: "text"\|"date"\|"currency"\|"badge", sortable?, options?: [{value,label}], badgeMap?: {value: badgeType} }` — supply `options` for any column stored as a code (or the table shows the code), and `badgeMap` on a `badge` column to give each status its colour — a JSON string (see note below) |
+| `detailRoute`  | No       | If set, each row gets a "View" action linking to `` `${detailRoute}/${row.id}` `` — typically a `vue-detail-view`'s route with the `:id` segment dropped                                                                                                                                                                                                              |
+| `filterable`   | No       | Whether to generate a debounced search input above the table. Defaults to `true`                                                                                                                                                                                                                                                                                      |
+| `heading`      | No       | Page heading. Defaults to the view name, title-cased                                                                                                                                                                                                                                                                                                                  |
+| `pageSize`     | No       | Rows per page. Defaults to `20`                                                                                                                                                                                                                                                                                                                                       |
+| `icon`         | No       | Ionicon name for the generated side-menu entry. Defaults to `list`. `goa-work-side-menu-item` renders a blank item without one                                                                                                                                                                                                                                        |
+| `requiresAuth` | No       | Whether the generated route requires authentication. Defaults to `true`                                                                                                                                                                                                                                                                                               |
 
 ---
 
@@ -322,16 +329,17 @@ that).
 npx nx g @abgov/nx-adsp:vue-admin-crud my-app --name=regions --resource=regions --route=/regions --fields='[{"key":"name","label":"Name"},{"key":"active","label":"Active","type":"checkbox"}]'
 ```
 
-| Option          | Required | Description                                                                                                                                                         |
-| --------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `project`       | Yes      | The `vue-app` project to add the views to                                                                                                                           |
-| `name`          | Yes      | View name, e.g. `regions` generates `src/views/RegionsListView.vue` and `src/views/RegionsEditView.vue`                                                             |
-| `resource`      | Yes      | API resource path segment — fetches `/api/<resource>` (list), `/api/<resource>/:id` (load one), `POST /api/<resource>` (create), `PUT /api/<resource>/:id` (update) |
-| `route`         | Yes      | List route path added to `router/index.ts`, e.g. `/regions`. The edit/create route is added as `` `${route}/:id` `` (visiting `${route}/new` creates)               |
-| `fields`        | Yes      | JSON array of fields, in display/form order: `{ key, label, type?: "text"\|"checkbox", required? }` — a JSON string (see note below)                                |
-| `heading`       | No       | List page heading. Defaults to the view name, title-cased                                                                                                           |
-| `singularLabel` | No       | Singular label used in "Create <label>"/"Edit <label>" headings and buttons. Defaults to `--heading` (override for irregular plurals)                               |
-| `requiresAuth`  | No       | Whether the generated routes require authentication. Defaults to `true`                                                                                             |
+| Option          | Required | Description                                                                                                                                                                     |
+| --------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `project`       | Yes      | The `vue-app` project to add the views to                                                                                                                                       |
+| `name`          | Yes      | View name, e.g. `regions` generates `src/views/RegionsListView.vue` and `src/views/RegionsEditView.vue`                                                                         |
+| `resource`      | Yes      | API resource path segment — fetches `/api/v1/<resource>` (list), `/api/v1/<resource>/:id` (load one), `POST /api/v1/<resource>` (create), `PUT /api/v1/<resource>/:id` (update) |
+| `route`         | Yes      | List route path added to `router/index.ts`, e.g. `/regions`. The edit/create route is added as `` `${route}/:id` `` (visiting `${route}/new` creates)                           |
+| `fields`        | Yes      | JSON array of fields, in display/form order: `{ key, label, type?: "text"\|"checkbox", required? }` — a JSON string (see note below)                                            |
+| `heading`       | No       | List page heading. Defaults to the view name, title-cased                                                                                                                       |
+| `singularLabel` | No       | Singular label used in "Create <label>"/"Edit <label>" headings and buttons. Defaults to `--heading` (override for irregular plurals)                                           |
+| `icon`          | No       | Ionicon name for the generated side-menu entry. Defaults to `settings`. `goa-work-side-menu-item` renders a blank item without one                                              |
+| `requiresAuth`  | No       | Whether the generated routes require authentication. Defaults to `true`                                                                                                         |
 
 ---
 
@@ -339,21 +347,22 @@ npx nx g @abgov/nx-adsp:vue-admin-crud my-app --name=regions --resource=regions
 
 Adds a route-per-step intake wizard (`Stepper` + `StepErrorSummary`, a required read-only
 review step, and a confirmation page) to an existing `vue-app` project. Cross-step state is
-server-persisted — each step PUTs/POSTs to `/api/<resource>/:id` and refetches on mount, so
+server-persisted — each step PUTs/POSTs to `/api/v1/<resource>/:id` and refetches on mount, so
 there's no client-side draft caching. Every field is currently a plain text input.
 
 ```bash
 npx nx g @abgov/nx-adsp:vue-intake-view my-app --name=application --resource=applications --route=/applications --steps='[{"key":"personal-info","label":"Personal information","fields":[{"key":"fullName","label":"Full name"}]}]'
 ```
 
-| Option         | Required | Description                                                                                                                                                                   |
-| -------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `project`      | Yes      | The `vue-app` project to add the views to                                                                                                                                     |
-| `name`         | Yes      | Base name for the generated views, e.g. `application` generates `<Step>StepView.vue` per step plus `ApplicationReviewView.vue`/`ApplicationConfirmationView.vue`              |
-| `resource`     | Yes      | API resource path segment. Each step fetches/saves `/api/<resource>/:id`; the review step's Submit posts `/api/<resource>/:id/submit`                                         |
-| `route`        | Yes      | Base route, e.g. `/applications`. Steps become `/applications/:id/<step-key>`, plus `/review` and `/confirmation`. Start a new intake at `/applications/new/<first-step-key>` |
-| `steps`        | Yes      | JSON array of steps, in order: `{ key, label, fields: [{ key, label, required? }] }` — a JSON string (see note below)                                                         |
-| `requiresAuth` | No       | Whether the generated routes require authentication. Defaults to `true`                                                                                                       |
+| Option           | Required | Description                                                                                                                                                                   |
+| ---------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `project`        | Yes      | The `vue-app` project to add the views to                                                                                                                                     |
+| `name`           | Yes      | Base name for the generated views, e.g. `application` generates `<Step>StepView.vue` per step plus `ApplicationReviewView.vue`/`ApplicationConfirmationView.vue`              |
+| `resource`       | Yes      | API resource path segment. Each step fetches/saves `/api/v1/<resource>/:id`; the review step's Submit posts `/api/v1/<resource>/:id/submit`                                   |
+| `route`          | Yes      | Base route, e.g. `/applications`. Steps become `/applications/:id/<step-key>`, plus `/review` and `/confirmation`. Start a new intake at `/applications/new/<first-step-key>` |
+| `steps`          | Yes      | JSON array of steps, in order: `{ key, label, fields: [{ key, label, required? }] }` — a JSON string (see note below)                                                         |
+| `referenceField` | No       | Field on the submitted record holding the business reference shown on the confirmation page. Defaults to `reference`; falls back to the route id when absent                  |
+| `requiresAuth`   | No       | Whether the generated routes require authentication. Defaults to `true`                                                                                                       |
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "13.31.0",
+  "version": "13.31.2",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for ADSP apps.",

package/src/generators/angular-app/angular-app.js

@@ -84,13 +84,13 @@ function default_1(host, options) {
         (0, quality_1.addAxeAccessibilityCheck)(host, `${normalizedOptions.projectRoot}-e2e`);
         (0, devkit_1.addDependenciesToPackageJson)(host, {
             '@abgov/angular-components': '5.3.0',
-            '@abgov/design-tokens': '2.12.0',
+            '@abgov/design-tokens': '2.12.8',
             // Pin exact (not ^2.0.0): angular-components 5.3.0 imports symbols added in
             // ui-components-common 2.3.0 (e.g. GoabWorkspaceLayoutScrollState), so a
             // lower 2.x resolves and fails the build. Keep this in lockstep with the
             // angular-components version above.
             '@abgov/ui-components-common': '2.3.0',
-            '@abgov/web-components': '2.3.0',
+            '@abgov/web-components': '2.4.0',
             'keycloak-angular': '^19.0.2',
             'keycloak-js': '^23.0.7',
             'zone.js': '~0.15.0',

package/src/generators/angular-app/files/AGENTS.md__tmpl__

@@ -146,6 +146,22 @@ describe('MyFeatureComponent', () => {
 });
 ```
 
+### Accessibility check — expand its route list
+
+The generated e2e project ships `src/a11y.spec.ts`: an axe-core check scoped to WCAG 2.1
+A/AA, run as part of the normal `e2e` target. **It only covers the routes named in its own
+`ROUTES` array, which ships as `['/']`.**
+
+Add an entry whenever you add a route — whether a generator added it or you hand-edited the
+router. Nothing does this for you: no generator writes to that file (it is left alone once it
+exists so your edits survive), so a router that has grown past `/` while `ROUTES` has not is
+a check that has quietly stopped covering the app. `/` is mostly app shell, so it exercises
+almost none of the elements the rest of the app is built from.
+
+Expect real failures when you expand it, and triage before fixing: some violations originate
+inside `@abgov/web-components`' own shadow DOM and cannot be addressed from app code. Those
+need an upstream fix or a documented exclusion, not a workaround in your view.
+
 ## OpenShift targets
 
 ```bash

package/src/generators/express-service/express-service.spec.ts

@@ -1,4 +1,9 @@
-import { addProjectConfiguration, readJson, readProjectConfiguration, writeJson } from '@nx/devkit';
+import {
+  addProjectConfiguration,
+  readJson,
+  readProjectConfiguration,
+  writeJson,
+} from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 
 import * as utils from '@abgov/nx-oc';
@@ -375,7 +380,7 @@ http {
 }
 `;
 
-    it('writes vite.proxy.json and patches serve target and nginx.conf for a Vue frontend', async () => {
+    it('writes vite.proxy.cjs and patches serve target and nginx.conf for a Vue frontend', async () => {
       const host = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
       addProjectConfiguration(host, 'my-vue-app', {
         root: 'apps/my-vue-app',
@@ -393,23 +398,33 @@ http {
 
       await generator(host, { ...options, pairedProject: 'my-vue-app' });
 
-      // Dev proxy file written at the Vue location.
-      expect(host.exists('apps/my-vue-app/vite.proxy.json')).toBeTruthy();
-      const proxyConf = readJson(host, 'apps/my-vue-app/vite.proxy.json');
+      // Dev proxy module written at the Vue location -- a .cjs module, because
+      // Vite rewrites with a function and ignores JSON's `pathRewrite`.
+      expect(host.exists('apps/my-vue-app/vite.proxy.cjs')).toBeTruthy();
+      const source = host.read('apps/my-vue-app/vite.proxy.cjs').toString();
+      const proxyModule = { exports: {} };
+      new Function('module', 'exports', source)(
+        proxyModule,
+        proxyModule.exports,
+      );
+      const proxyConf = proxyModule.exports as Record<
+        string,
+        { target: string; rewrite: (path: string) => string }
+      >;
       expect(proxyConf['/api/']).toBeDefined();
       expect(proxyConf['/api/'].target).toBe('http://localhost:3333');
-      expect(proxyConf['/api/'].pathRewrite['^/api/']).toBe('/test/');
+      expect(proxyConf['/api/'].rewrite('/api/v1/things')).toBe(
+        '/test/v1/things',
+      );
 
       // serve target updated with proxyConfig.
       const frontendConfig = readProjectConfiguration(host, 'my-vue-app');
       expect(frontendConfig.targets.serve.options.proxyConfig).toBe(
-        'apps/my-vue-app/vite.proxy.json',
+        'apps/my-vue-app/vite.proxy.cjs',
       );
 
       // nginx.conf updated with the proxy block.
-      const nginx = host
-        .read('apps/my-vue-app/public/nginx.conf')
-        .toString();
+      const nginx = host.read('apps/my-vue-app/public/nginx.conf').toString();
       expect(nginx).toContain('location /api/');
       expect(nginx).toContain('proxy_pass http://test:3333/test/');
 
@@ -482,9 +497,7 @@ http {
             executor: '@angular-devkit/build-angular:browser',
             options: {
               outputPath: 'dist/apps/my-angular-app',
-              assets: [
-                `apps/my-angular-app/src/silent-check-sso.html`,
-              ],
+              assets: [`apps/my-angular-app/src/silent-check-sso.html`],
             },
           },
         },

package/src/generators/express-service/schema.json

@@ -70,7 +70,7 @@
     },
     "pairedProject": {
       "type": "string",
-      "description": "Name of a frontend app project (vue-app, react-app, or angular-app) to pair with this service. When that frontend already exists in the workspace, the generator automatically wires its nginx proxy config, dev-server proxy file (vite.proxy.json or proxy.conf.json), serve target proxyConfig, and adsp:proxy-service: tag. Set automatically by composite generators (pevn, pern, pean, mern, mean) — also valid standalone when the frontend was scaffolded first."
+      "description": "Name of a frontend app project (vue-app, react-app, or angular-app) to pair with this service. When that frontend already exists in the workspace, the generator automatically wires its nginx proxy config, dev-server proxy file (vite.proxy.cjs for Vue, proxy.conf.json for React/Angular), serve target proxyConfig, and adsp:proxy-service: tag. Set automatically by composite generators (pevn, pern, pean, mern, mean) — also valid standalone when the frontend was scaffolded first."
     },
     "cors": {
       "type": "boolean",

package/src/generators/react-app/files/AGENTS.md__tmpl__

@@ -129,6 +129,22 @@ describe('MyFeature', () => {
 });
 ```
 
+### Accessibility check — expand its route list
+
+The generated e2e project ships `src/a11y.spec.ts`: an axe-core check scoped to WCAG 2.1
+A/AA, run as part of the normal `e2e` target. **It only covers the routes named in its own
+`ROUTES` array, which ships as `['/']`.**
+
+Add an entry whenever you add a route — whether a generator added it or you hand-edited the
+router. Nothing does this for you: no generator writes to that file (it is left alone once it
+exists so your edits survive), so a router that has grown past `/` while `ROUTES` has not is
+a check that has quietly stopped covering the app. `/` is mostly app shell, so it exercises
+almost none of the elements the rest of the app is built from.
+
+Expect real failures when you expand it, and triage before fixing: some violations originate
+inside `@abgov/web-components`' own shadow DOM and cannot be addressed from app code. Those
+need an upstream fix or a documented exclusion, not a workaround in your view.
+
 ## OpenShift targets
 
 ```bash

package/src/generators/react-app/react-app.js

@@ -81,9 +81,9 @@ function default_1(host, options) {
         (0, quality_1.guardPlaywrightWebServer)(host, `${normalizedOptions.projectRoot}-e2e`);
         (0, quality_1.addAxeAccessibilityCheck)(host, `${normalizedOptions.projectRoot}-e2e`);
         (0, devkit_1.addDependenciesToPackageJson)(host, {
-            '@abgov/design-tokens': '2.12.0',
+            '@abgov/design-tokens': '2.12.8',
             '@abgov/react-components': '7.3.0',
-            '@abgov/web-components': '2.3.0',
+            '@abgov/web-components': '2.4.0',
             '@reduxjs/toolkit': '^2.5.1',
             'keycloak-js': '^23.0.7',
             'react-redux': '^9.2.0',

package/src/generators/vue-admin-crud/files/src/views/__editViewFileName__.vue__tmpl__

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { reactive, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { useKeycloak } from '@dsb-norge/vue-keycloak-js';
 import {
 <% if (fields.some((f) => !f.type || f.type === 'text' || f.type === 'number')) { -%>
   GoabInput,
@@ -27,7 +26,6 @@ import { useApi } from '../composables/useApi';
 
 const route = useRoute();
 const router = useRouter();
-const kc = useKeycloak();
 const { get, save } = useApi();
 
 const idParam = computed(() => String(route.params.id ?? ''));
@@ -207,11 +205,11 @@ onUnmounted(() => {
 <% if (field.type === 'checkbox') { -%>
       <!-- The checkbox carries its own label via `text`; goa-form-item must not
            repeat it, or it renders twice. -->
-      <goa-form-item>
+      <goa-form-item mb="l">
         <GoabCheckbox v-model="form.<%= field.key %>" name="<%= field.key %>" text="<%= field.label %>" />
       </goa-form-item>
 <% } else { -%>
-      <goa-form-item label="<%= field.label %>"<% if (field.required !== false) { %> requirement="required"<% } %> :error="errors.<%= field.key %>">
+      <goa-form-item mb="l" label="<%= field.label %>"<% if (field.required !== false) { %> requirement="required"<% } %> :error="errors.<%= field.key %>">
 <% if (field.type === 'textarea') { -%>
         <GoabTextarea v-model="form.<%= field.key %>" name="<%= field.key %>" />
 <% } else if (field.type === 'number') { -%>
@@ -238,7 +236,7 @@ onUnmounted(() => {
       <goa-spacer vspacing="l" />
 
       <goa-button-group gap="relaxed">
-        <goa-button v-if="kc.authenticated" type="primary" :disabled="saving || undefined" @_click="onSubmit">
+        <goa-button type="primary" :disabled="saving || undefined" @_click="onSubmit">
           {{ isNew ? 'Create <%= singularLabel %>' : 'Save changes' }}
         </goa-button>
         <goa-button type="secondary" @_click="goBack">Cancel</goa-button>

package/src/generators/vue-admin-crud/files/src/views/__listViewFileName__.vue__tmpl__

@@ -1,11 +1,32 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { useKeycloak } from '@dsb-norge/vue-keycloak-js';
-import { WorkspaceTable } from '<%= goaImportPath %>';
+import {
+  WorkspaceTable,
+<% if (hasCodedFields) { -%>
+  optionLabel,
+<% } -%>
+<% if (hasDateFields) { -%>
+  formatDate,
+<% } -%>
+} from '<%= goaImportPath %>';
+<% if (hasCodedFields) { -%>
+import type { DisplayOption } from '<%= goaImportPath %>';
+<% } -%>
 import { useApi } from '../composables/useApi';
 
-const kc = useKeycloak();
 const { list } = useApi();
+<% if (hasCodedFields) { -%>
+
+// Value -> label for coded fields, so the table shows the same prose the edit
+// form's dropdown does rather than the stored code.
+const fieldOptions: Record<string, DisplayOption[]> = {
+<% fields.forEach(function (field) { -%>
+<% if (field.options && field.options.length) { -%>
+  '<%= field.key %>': <%- JSON.stringify(field.options) %>,
+<% } -%>
+<% }); -%>
+};
+<% } -%>
 
 const columns = [
 <% fields.forEach(function (field) { -%>
@@ -38,7 +59,7 @@ onMounted(load);
   <div>
     <div class="admin-crud-topbar">
       <h1><%= heading %></h1>
-      <router-link v-if="kc.authenticated" to="<%= route %>/new">
+      <router-link to="<%= route %>/new">
         <goa-button type="primary">Create <%= singularLabel %></goa-button>
       </router-link>
     </div>
@@ -53,6 +74,14 @@ onMounted(load);
       <template #cell-<%= field.key %>="{ row }">
         <goa-badge :type="row['<%= field.key %>'] ? 'success' : 'midtone'" :content="row['<%= field.key %>'] ? 'Yes' : 'No'" />
       </template>
+<% } else if (field.options && field.options.length) { -%>
+      <template #cell-<%= field.key %>="{ row }">
+        {{ optionLabel(fieldOptions['<%= field.key %>'], row['<%= field.key %>']) }}
+      </template>
+<% } else if (field.type === 'date') { -%>
+      <template #cell-<%= field.key %>="{ row }">
+        {{ formatDate(row['<%= field.key %>']) }}
+      </template>
 <% } -%>
 <% }); -%>
       <template #actions="{ row }">

package/src/generators/vue-admin-crud/schema.d.ts

@@ -20,6 +20,8 @@ export interface Schema {
   fields: string | AdminCrudField[];
   heading?: string;
   singularLabel?: string;
+  /** Ionicon name for the side-menu entry. Defaults per generator. */
+  icon?: string;
   requiresAuth?: boolean;
 }
 

package/src/generators/vue-admin-crud/schema.json

@@ -25,7 +25,7 @@
     },
     "resource": {
       "type": "string",
-      "description": "API resource path segment -- fetches /api/<resource> (list), /api/<resource>/:id (load one), POST /api/<resource> (create), PUT /api/<resource>/:id (update)."
+      "description": "API resource path segment -- fetches /api/v1/<resource> (list), /api/v1/<resource>/:id (load one), POST /api/v1/<resource> (create), PUT /api/v1/<resource>/:id (update)."
     },
     "route": {
       "type": "string",
@@ -43,18 +43,17 @@
       "type": "string",
       "description": "Singular label used in \"Create <label>\"/\"Edit <label>\" headings and buttons. Defaults to --heading (override for irregular plurals, e.g. --heading=Regions --singularLabel=Region)."
     },
+    "icon": {
+      "type": "string",
+      "description": "Ionicon name for the generated side-menu entry, e.g. `settings`. goa-work-side-menu-item renders a blank item without one.",
+      "default": "settings"
+    },
     "requiresAuth": {
       "type": "boolean",
       "description": "Whether the generated routes require authentication.",
       "default": true
     }
   },
-  "required": [
-    "project",
-    "name",
-    "resource",
-    "route",
-    "fields"
-  ],
+  "required": ["project", "name", "resource", "route", "fields"],
   "additionalProperties": false
 }

package/src/generators/vue-admin-crud/vue-admin-crud.js

@@ -54,11 +54,15 @@ function normalizeOptions(host, options) {
 }
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
         const normalizedOptions = normalizeOptions(host, options);
         // Idempotent -- ensures WorkspaceTable exists even in a project scaffolded
         // before vue-components carried it.
         yield (0, vue_components_1.default)(host);
-        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), normalizedOptions.projectRoot, Object.assign(Object.assign({}, normalizedOptions), { goaImportPath: (0, vue_components_1.vueComponentsImportPath)(host), tmpl: '' }));
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), normalizedOptions.projectRoot, Object.assign(Object.assign({}, normalizedOptions), { goaImportPath: (0, vue_components_1.vueComponentsImportPath)(host), 
+            // Derived here, not tested inline: EJS throws a ReferenceError on a bare
+            // undefined variable, so a flag the template reads must always be defined.
+            hasCodedFields: normalizedOptions.fields.some((field) => { var _a; return (_a = field.options) === null || _a === void 0 ? void 0 : _a.length; }), hasDateFields: normalizedOptions.fields.some((field) => field.type === 'date'), tmpl: '' }));
         // The edit route also serves create: visiting `${route}/new` matches the
         // same `:id` param (id === 'new'), same convention the real reference
         // implementation this was modeled on uses -- no separate create route.
@@ -78,6 +82,7 @@ function default_1(host, options) {
         (0, vue_side_menu_1.insertSideMenuItem)(host, normalizedOptions.projectRoot, {
             label: normalizedOptions.heading,
             to: normalizedOptions.route,
+            icon: (_a = normalizedOptions.icon) !== null && _a !== void 0 ? _a : 'settings',
         });
         yield (0, devkit_1.formatFiles)(host);
     });

package/src/generators/vue-admin-crud/vue-admin-crud.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue-admin-crud.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-admin-crud/vue-admin-crud.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vue-admin-crud.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/vue-admin-crud/vue-admin-crud.ts"],"names":[],"mappings":"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"}