@gravitee/ui-schematics 12.11.1 → 12.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravitee/ui-schematics",
-  "version": "12.11.1",
+  "version": "12.11.2",
   "description": "Gravitee.io - UI Schematics",
   "repository": {
     "type": "git",

package/schematics/components/component-for-dialog/files/{__name@dasherize__-dialog.component.html.template → __name@dasherize__.component.html.template}

@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<span mat-dialog-title><%= name %> Dialog</span>
+<span mat-dialog-title><%= name %></span>
 
 <mat-dialog-content>
   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla vel odio nec mi

package/schematics/components/component-for-dialog/files/{__name@dasherize__-dialog.component.spec.ts.template → __name@dasherize__.component.spec.ts.template}

@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /*
  * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
  *
@@ -36,20 +21,20 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 
-import { <%= classify(name) %>DialogHarness } from './<%= dasherize(name) %>-dialog.harness';
-import { <%= classify(name) %>DialogComponent, <%= classify(name) %>DialogData, <%= classify(name) %>DialogResult } from './<%= dasherize(name) %>-dialog.component';
+import { <%= classify(name) %>Harness } from './<%= dasherize(name) %>.harness';
+import { <%= classify(name) %>Component, <%= classify(name) %>Data, <%= classify(name) %>Result } from './<%= dasherize(name) %>.component';
 
 @Component({
   selector: 'test-component',
   template: ``,
-  imports: [<%= classify(name) %>DialogComponent, MatDialogModule, MatIconTestingModule],
+  imports: [<%= classify(name) %>Component, MatDialogModule, MatIconTestingModule],
   standalone: true,
 })
 class SpecDialogComponent {
   constructor(private readonly matDialog: MatDialog) {}
 
-  public open(data?: <%= classify(name) %>DialogData) {
-    return this.matDialog.open<<%= classify(name) %>DialogComponent, <%= classify(name) %>DialogData, <%= classify(name) %>DialogResult>(<%= classify(name) %>DialogComponent, {
+  public open(data?: <%= classify(name) %>Data) {
+    return this.matDialog.open<<%= classify(name) %>Component, <%= classify(name) %>Data, <%= classify(name) %>Result>(<%= classify(name) %>Component, {
       data,
       role: 'dialog',
       id: 'test-dialog',
@@ -57,7 +42,7 @@ class SpecDialogComponent {
   }
 }
 
-describe('<%= classify(name) %>DialogComponent', () => {
+describe('<%= classify(name) %>Component', () => {
   let fixture: ComponentFixture<SpecDialogComponent>;
   let loader: HarnessLoader;
 
@@ -74,9 +59,9 @@ describe('<%= classify(name) %>DialogComponent', () => {
   it('should open dialog', async () => {
     fixture.componentInstance.open();
 
-    const dialog = await loader.getHarness(<%= classify(name) %>DialogHarness);
+    const dialog = await loader.getHarness(<%= classify(name) %>Harness);
 
-    expect(await dialog.getTitleText()).toEqual('<%= classify(name) %> Dialog');
+    expect(await dialog.getTitleText()).toEqual('<%= name %>');
     expect(await dialog.getContentText()).toContain('Lorem');
     expect(await dialog.getActionsText()).toContain('My action');
   });
@@ -88,7 +73,7 @@ describe('<%= classify(name) %>DialogComponent', () => {
       .afterClosed()
       .subscribe(result => (dialogResult = result));
 
-    const dialog = await loader.getHarness(<%= classify(name) %>DialogHarness);
+    const dialog = await loader.getHarness(<%= classify(name) %>Harness);
 
     await dialog.close();
     expect(dialogResult).toEqual(false);
@@ -101,7 +86,7 @@ describe('<%= classify(name) %>DialogComponent', () => {
       .afterClosed()
       .subscribe(result => (dialogResult = result));
 
-    const dialog = await loader.getHarness(<%= classify(name) %>DialogHarness);
+    const dialog = await loader.getHarness(<%= classify(name) %>Harness);
 
     await dialog.confirmMyAction();
     expect(dialogResult).toEqual(true);

package/schematics/components/component-for-dialog/files/{__name@dasherize__-dialog.component.ts.template → __name@dasherize__.component.ts.template}

@@ -17,21 +17,21 @@ import { Component, Inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 
-export interface <%= classify(name) %>DialogData {}
+export interface <%= classify(name) %>Data {}
 
-export type <%= classify(name) %>DialogResult = boolean;
+export type <%= classify(name) %>Result = boolean;
 
 @Component({
-  selector: '<%= dasherize(name) %>-dialog',
-  templateUrl: './<%= dasherize(name) %>-dialog.component.html',
-  styleUrls: ['./<%= dasherize(name) %>-dialog.component.scss'],
+  selector: '<%= dasherize(name) %>',
+  templateUrl: './<%= dasherize(name) %>.component.html',
+  styleUrls: ['./<%= dasherize(name) %>.component.scss'],
   standalone: true,
   imports: [MatDialogModule, MatButtonModule],
 })
-export class <%= classify(name) %>DialogComponent {
+export class <%= classify(name) %>Component {
   constructor(
     @Inject(MAT_DIALOG_DATA)
-    public data: <%= classify(name) %>DialogData,
-    public dialogRef: MatDialogRef<<%= classify(name) %>DialogComponent, <%= classify(name) %>DialogResult>,
+    public data: <%= classify(name) %>Data,
+    public dialogRef: MatDialogRef<<%= classify(name) %>Component, <%= classify(name) %>Result>,
   ) {}
 }

package/schematics/components/component-for-dialog/files/{__name@dasherize__-dialog.harness.ts.template → __name@dasherize__.harness.ts.template}

@@ -17,13 +17,13 @@ import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular
 import { MatDialogSection } from '@angular/material/dialog/testing';
 import { MatButtonHarness } from '@angular/material/button/testing';
 
-export interface <%= classify(name) %>DialogHarnessOptions extends BaseHarnessFilters {}
+export interface <%= classify(name) %>HarnessOptions extends BaseHarnessFilters {}
 
-export class <%= classify(name) %>DialogHarness extends ComponentHarness {
-  public static readonly hostSelector = `<%= dasherize(name) %>-dialog`;
+export class <%= classify(name) %>Harness extends ComponentHarness {
+  public static readonly hostSelector = `<%= dasherize(name) %>`;
 
-  public static with(options: <%= classify(name) %>DialogHarnessOptions): HarnessPredicate<<%= classify(name) %>DialogHarness> {
-    return new HarnessPredicate(<%= classify(name) %>DialogHarness, options);
+  public static with(options: <%= classify(name) %>HarnessOptions): HarnessPredicate<<%= classify(name) %>Harness> {
+    return new HarnessPredicate(<%= classify(name) %>Harness, options);
   }
 
   protected _title = this.locatorForOptional(MatDialogSection.TITLE);

package/schematics/components/component-for-dialog/files/{__name@dasherize__-dialog.stories.ts.template → __name@dasherize__.stories.ts.template}

@@ -19,20 +19,20 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { action } from '@storybook/addon-actions';
 
-import { <%= classify(name) %>DialogComponent, <%= classify(name) %>DialogData, <%= classify(name) %>DialogResult } from './<%= dasherize(name) %>-dialog.component';
+import { <%= classify(name) %>Component, <%= classify(name) %>Data, <%= classify(name) %>Result } from './<%= dasherize(name) %>.component';
 
 @Component({
   selector: 'story-component',
   template: `<button id="open-dialog" (click)="open()">Open dialog</button>`,
-  imports: [<%= classify(name) %>DialogComponent, MatDialogModule, MatIconTestingModule],
+  imports: [<%= classify(name) %>Component, MatDialogModule, MatIconTestingModule],
   standalone: true,
 })
 class StoryDialogComponent {
   constructor(private readonly matDialog: MatDialog) {}
 
-  public open(data?: <%= classify(name) %>DialogData) {
+  public open(data?: <%= classify(name) %>Data) {
     return this.matDialog
-      .open<<%= classify(name) %>DialogComponent, <%= classify(name) %>DialogData, <%= classify(name) %>DialogResult>(<%= classify(name) %>DialogComponent, {
+      .open<<%= classify(name) %>Component, <%= classify(name) %>Data, <%= classify(name) %>Result>(<%= classify(name) %>Component, {
         data,
         role: 'dialog',
         id: 'test-story-dialog',
@@ -45,7 +45,7 @@ class StoryDialogComponent {
 }
 
 export default {
-  title: '<%= classify(name) %>DialogComponent story',
+  title: '<%= classify(name) %>Component story',
   component: StoryDialogComponent,
 } as Meta;
 

package/schematics/components/component-for-dialog/index.js

@@ -1,8 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createComponentForDialog = void 0;
+/*
+ * Copyright (C) 2024 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
 function createComponentForDialog(options) {
+    if (options.name.includes('dialog')) {
+        throw new schematics_1.SchematicsException('Component name should not contain "dialog". Dialog suffix will be added automatically.');
+    }
+    options.name = `${options.name}-dialog`;
     return (0, utils_1.createComponent)(options);
 }
 exports.createComponentForDialog = createComponentForDialog;

package/schematics/components/component-for-dialog/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../projects/ui-schematics/schematics/components/component-for-dialog/index.ts"],"names":[],"mappings":";;;AAiBA,oCAA2C;AAG3C,SAAgB,wBAAwB,CAAC,OAAe;IACtD,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAFD,4DAEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../projects/ui-schematics/schematics/components/component-for-dialog/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,2DAAuE;AAEvE,oCAA2C;AAG3C,SAAgB,wBAAwB,CAAC,OAAe;IACtD,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,gCAAmB,CAAC,wFAAwF,CAAC,CAAC;IAC1H,CAAC;IAED,OAAO,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,SAAS,CAAC;IACxC,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAPD,4DAOC"}