Skip to content

Commit 7ef079d

Browse files
josemontespgjosemontespg
committed
refactor: remove minimal catalog from renderers, keep in spec, and add simple basic samples
Remove all 'minimal' catalog usage and logic from the renderer packages (Angular and React) to eliminate maintenance burden and catalog ID override hacks. The minimal catalog and its examples remain in the specification for historical reference. To ensure developers still have simple entry-point examples in the standard Basic Catalog, we have: - Copied the simple minimal examples into the basic catalog examples directory (prefixed with `00_` so they sort first). - Renamed the simple login form example to `00_simple-login-form.json` to avoid name collisions with the original basic login form (`09_login-form.json`). - Added the `capitalize` function definition to the v0.9 and v0.10 basic catalogs, as it is used by the migrated `00_capitalized-text.json` example. - Re-added the simple tests in Angular as basic `00_` tests, loading from the basic catalog, verifying that renderers can load these simple examples from the basic catalog. Fixes a2ui-project#1432 TAG=agy CONV=9137c307-af0d-4380-8e89-52054dd1fcb0
1 parent 76dff6a commit 7ef079d

60 files changed

Lines changed: 2835 additions & 4986 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎renderers/angular/a2ui_explorer/src/app/tests/utils/test_utils.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,7 @@ export async function loadExample(exampleName: string, version: Version = Versio
4343
fixture.detectChanges();
4444

4545
const examples = version === Version.V0_9 ? EXAMPLES_V09 : EXAMPLES_V08;
46-
let example = examples.find(ex => ex.name === exampleName);
47-
48-
if (version === Version.V0_8 && !example) {
49-
example =
50-
examples.find(ex => ex.name === `${exampleName} (basic)`) ||
51-
examples.find(ex => ex.name === `${exampleName} (minimal)`);
52-
}
46+
const example = examples.find(ex => ex.name === exampleName);
5347

5448
expect(example).withContext(`Example not found: ${exampleName}`).toBeTruthy();
5549

renderers/angular/a2ui_explorer/src/app/tests/v0_8/5_complex_layout.spec.ts renamed to renderers/angular/a2ui_explorer/src/app/tests/v0_8/00_complex-layout.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import {Version, getCanvas, loadExample} from '../utils/test_utils';
1818

19-
describe('Example: Complex Layout (minimal) (v0.8)', () => {
19+
describe('Example: Complex Layout (v0.8)', () => {
2020
let textContent: string;
2121

2222
beforeEach(async () => {
23-
await loadExample('Complex Layout (minimal)', Version.V0_8);
23+
await loadExample('Complex Layout', Version.V0_8);
2424
textContent = getCanvas().textContent;
2525
});
2626

renderers/angular/a2ui_explorer/src/app/tests/v0_8/3_interactive_button.spec.ts renamed to renderers/angular/a2ui_explorer/src/app/tests/v0_8/00_interactive-button.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import {ComponentFixture} from '@angular/core/testing';
1818
import {DemoComponent} from '../../demo.component';
1919
import {Version, getCanvas, loadExample, wait} from '../utils/test_utils';
2020

21-
describe('Example: Interactive Button (minimal) (v0.8)', () => {
21+
describe('Example: Interactive Button (v0.8)', () => {
2222
let textContent: string;
2323
let fixture: ComponentFixture<DemoComponent>;
2424

2525
beforeEach(async () => {
26-
fixture = await loadExample('Interactive Button (minimal)', Version.V0_8);
26+
fixture = await loadExample('Interactive Button', Version.V0_8);
2727
textContent = getCanvas().textContent;
2828
});
2929

renderers/angular/a2ui_explorer/src/app/tests/v0_8/2_row_layout.spec.ts renamed to renderers/angular/a2ui_explorer/src/app/tests/v0_8/00_row-layout.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import {Version, getCanvas, loadExample} from '../utils/test_utils';
1818

19-
describe('Example: Row Layout (minimal) (v0.8)', () => {
19+
describe('Example: Row Layout (v0.8)', () => {
2020
let textContent: string;
2121

2222
beforeEach(async () => {
23-
await loadExample('Row Layout (minimal)', Version.V0_8);
23+
await loadExample('Row Layout', Version.V0_8);
2424
textContent = getCanvas().textContent;
2525
});
2626

renderers/angular/a2ui_explorer/src/app/tests/v0_8/4_login_form.spec.ts renamed to renderers/angular/a2ui_explorer/src/app/tests/v0_8/00_simple-login-form.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import {ComponentFixture} from '@angular/core/testing';
1818
import {DemoComponent} from '../../demo.component';
1919
import {Version, getCanvas, loadExample, wait} from '../utils/test_utils';
2020

21-
describe('Example: Login Form (minimal) (v0.8)', () => {
21+
describe('Example: Simple Login Form (v0.8)', () => {
2222
let textContent: string;
2323
let fixture: ComponentFixture<DemoComponent>;
2424

2525
beforeEach(async () => {
26-
fixture = await loadExample('Login Form (minimal)', Version.V0_8);
26+
fixture = await loadExample('Simple Login Form', Version.V0_8);
2727
textContent = getCanvas().textContent;
2828
});
2929

renderers/angular/a2ui_explorer/src/app/tests/v0_8/1_simple_text.spec.ts renamed to renderers/angular/a2ui_explorer/src/app/tests/v0_8/00_simple-text.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import {Version, getCanvas, loadExample} from '../utils/test_utils';
1818

19-
describe('Example: Simple Text (minimal) (v0.8)', () => {
19+
describe('Example: Simple Text (v0.8)', () => {
2020
let textContent: string;
2121

2222
beforeEach(async () => {
23-
await loadExample('Simple Text (minimal)', Version.V0_8);
23+
await loadExample('Simple Text', Version.V0_8);
2424
textContent = getCanvas().textContent;
2525
});
2626

‎renderers/angular/a2ui_explorer/src/app/tests/v0_8/03_calendar-day.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import {ComponentFixture} from '@angular/core/testing';
1818
import {DemoComponent} from '../../demo.component';
1919
import {Version, getCanvas, loadExample, wait} from '../utils/test_utils';
2020

21-
describe('Example: Calendar Day (basic) (v0.8)', () => {
21+
describe('Example: Calendar Day (v0.8)', () => {
2222
let textContent: string;
2323
let fixture: ComponentFixture<DemoComponent>;
2424

2525
beforeEach(async () => {
26-
fixture = await loadExample('Calendar Day (basic)', Version.V0_8);
26+
fixture = await loadExample('Calendar Day', Version.V0_8);
2727
textContent = getCanvas().textContent;
2828
});
2929

‎renderers/angular/a2ui_explorer/src/app/tests/v0_8/04_weather-current.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
import {Version, getCanvas, loadExample} from '../utils/test_utils';
1818

19-
describe('Example: Weather Current (basic) (v0.8)', () => {
19+
describe('Example: Weather Current (v0.8)', () => {
2020
let textContent: string;
2121

2222
beforeEach(async () => {
23-
await loadExample('Weather Current (basic)', Version.V0_8);
23+
await loadExample('Weather Current', Version.V0_8);
2424
textContent = getCanvas().textContent;
2525
});
2626

‎renderers/angular/a2ui_explorer/src/app/tests/v0_8/05_product-card.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import {ComponentFixture} from '@angular/core/testing';
1818
import {DemoComponent} from '../../demo.component';
1919
import {Version, getCanvas, loadExample, wait} from '../utils/test_utils';
2020

21-
describe('Example: Product Card (basic) (v0.8)', () => {
21+
describe('Example: Product Card (v0.8)', () => {
2222
let textContent: string;
2323
let fixture: ComponentFixture<DemoComponent>;
2424

2525
beforeEach(async () => {
26-
fixture = await loadExample('Product Card (basic)', Version.V0_8);
26+
fixture = await loadExample('Product Card', Version.V0_8);
2727
textContent = getCanvas().textContent;
2828
});
2929

‎renderers/angular/a2ui_explorer/src/app/tests/v0_8/06_music-player.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import {ComponentFixture} from '@angular/core/testing';
1818
import {DemoComponent} from '../../demo.component';
1919
import {Version, getCanvas, loadExample, wait} from '../utils/test_utils';
2020

21-
describe('Example: Music Player (basic) (v0.8)', () => {
21+
describe('Example: Music Player (v0.8)', () => {
2222
let textContent: string;
2323
let fixture: ComponentFixture<DemoComponent>;
2424

2525
beforeEach(async () => {
26-
fixture = await loadExample('Music Player (basic)', Version.V0_8);
26+
fixture = await loadExample('Music Player', Version.V0_8);
2727
textContent = getCanvas().textContent;
2828
});
2929

0 commit comments

Comments
 (0)