Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#27634: Image AI: Migrate logic to a dialog and add accordions for se…
…ttings and prompt. (#27913) * initial progress * initial progress * clean up accordion styles * progress * progress * progress * progress * progress * adding labels and split to gallery component * adding labels and split to gallery component * testing eslint validation * eslint test * remove files * loading rules ready for first demo * loading rules ready for first demo * test progress and mock of splitbutton * test progress and mock of splitbutton * code clean up & comment primeng styles * add test and fix details * feedback part 1 * feedback part 1 * feedback 2 * feedback 2 * feedback * feedback * feedback * lint missing cheks
- Loading branch information
Showing
33 changed files
with
1,163 additions
and
609 deletions.
There are no files selected for viewing
50 changes: 50 additions & 0 deletions
50
core-web/apps/dotcms-ui/src/stories/primeng/panel/Accordion.stories.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import { Meta, Story } from '@storybook/angular'; | ||
|
|
||
| import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; | ||
|
|
||
| import { Accordion, AccordionModule } from 'primeng/accordion'; | ||
|
|
||
| export default { | ||
| title: 'PrimeNG/Panel/Accordion', | ||
| component: Accordion, | ||
| args: { activeIndex: 0, expandIcon: 'pi pi-angle-down', collapseIcon: 'pi pi-angle-up' }, | ||
| parameters: { | ||
| docs: { | ||
| description: { | ||
| component: | ||
| 'Accordion groups a collection of contents in tabs.: https://www.primefaces.org/primeng-v15-lts/accordion' | ||
| } | ||
| } | ||
| } | ||
| } as Meta; | ||
|
|
||
| const BasicTemplate = ` | ||
| <p-accordion [activeIndex]="activeIndex" [expandIcon]="expandIcon" [collapseIcon]="collapseIcon"> | ||
| <p-accordionTab header="Header I" iconPos="end"> | ||
| <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation | ||
| ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. | ||
| Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p> | ||
| </p-accordionTab> | ||
| <p-accordionTab header="Header II" iconPos="end" > | ||
| <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi | ||
| architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione | ||
| voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi.</p> | ||
| </p-accordionTab> | ||
| <p-accordionTab header="Header III" iconPos="end" [disabled]="true"> | ||
| <p>At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati | ||
| cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. | ||
| Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus.</p> | ||
| </p-accordionTab> | ||
| </p-accordion>`; | ||
|
|
||
| export const Main: Story = (args) => { | ||
| return { | ||
| props: { | ||
| activeIndex: args.activeIndex, | ||
| expandIcon: args.expandIcon, | ||
| collapseIcon: args.collapseIcon | ||
| }, | ||
| moduleMetadata: { imports: [AccordionModule, BrowserAnimationsModule] }, | ||
| template: BasicTemplate | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 16 additions & 1 deletion
17
core-web/libs/block-editor/src/lib/extensions/ai-image-prompt/ai-image-prompt.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,20 @@ | ||
| @use "variables" as *; | ||
|
|
||
| .dialog-prompts__wrapper { | ||
| .dialog-prompt__wrapper { | ||
| gap: $spacing-5; | ||
| display: grid; | ||
| grid-template-columns: 1fr 1fr; | ||
|
|
||
| > * { | ||
| display: flex; | ||
| flex-direction: column; | ||
| flex: 1; | ||
| justify-content: center; | ||
| } | ||
| } | ||
|
|
||
| .dialog-prompt_gallery { | ||
| > * { | ||
| margin-top: auto; | ||
| } | ||
| } |
95 changes: 76 additions & 19 deletions
95
...eb/libs/block-editor/src/lib/extensions/ai-image-prompt/ai-image-prompt.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,85 @@ | ||
| import { HttpClientTestingModule } from '@angular/common/http/testing'; | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
| import { ReactiveFormsModule } from '@angular/forms'; | ||
| import { byTestId, createComponentFactory, Spectator } from '@ngneat/spectator'; | ||
| import { of } from 'rxjs'; | ||
|
|
||
| import { Dialog } from 'primeng/dialog'; | ||
|
|
||
| import { AIImagePromptComponent } from './ai-image-prompt.component'; | ||
| import { DotAiImagePromptStore } from './ai-image-prompt.store'; | ||
| import { AiImagePromptFormComponent } from './components/ai-image-prompt-form/ai-image-prompt-form.component'; | ||
|
|
||
| import { DotAiService } from '../../shared'; | ||
| import { | ||
| AIImagePrompt, | ||
| DotAIImageOrientation, | ||
| DotGeneratedAIImage | ||
| } from '../../shared/services/dot-ai/dot-ai.models'; | ||
|
|
||
| describe('AIImagePromptComponent', () => { | ||
| let component: AIImagePromptComponent; | ||
| let fixture: ComponentFixture<AIImagePromptComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| imports: [ReactiveFormsModule, HttpClientTestingModule], | ||
| declarations: [AIImagePromptComponent], | ||
| providers: [DotAiService] | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(AIImagePromptComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| let spectator: Spectator<AIImagePromptComponent>; | ||
| let store: DotAiImagePromptStore; | ||
|
|
||
| const imagesMock: DotGeneratedAIImage[] = [ | ||
| { name: 'image1', url: 'image_url' }, | ||
| { name: 'image2', url: 'image_url_2' } | ||
| ] as unknown as DotGeneratedAIImage[]; | ||
|
|
||
| const createComponent = createComponentFactory({ | ||
| component: AIImagePromptComponent, | ||
| providers: [ | ||
| { | ||
| provide: DotAiImagePromptStore, | ||
| useValue: { | ||
| vm$: of({ | ||
| showDialog: true, | ||
| isLoading: false, | ||
| images: imagesMock, | ||
| galleryActiveIndex: 0, | ||
| orientation: DotAIImageOrientation.VERTICAL | ||
| }), | ||
| generateImage: jasmine.createSpy('generateImage'), | ||
| hideDialog: jasmine.createSpy('hideDialog'), | ||
| patchState: jasmine.createSpy('patchState'), | ||
| cleanError: jasmine.createSpy('cleanError') | ||
| } | ||
| } | ||
| ] | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| spectator = createComponent(); | ||
| store = spectator.inject(DotAiImagePromptStore); | ||
| }); | ||
|
|
||
| it('should hide dialog', () => { | ||
| const dialog = spectator.query(Dialog); | ||
| dialog.onHide.emit('true'); | ||
| expect(store.hideDialog).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should generate image', () => { | ||
| const promptForm = spectator.query(AiImagePromptFormComponent); | ||
| const formMock: AIImagePrompt = { | ||
| text: 'Test', | ||
| type: 'input', | ||
| size: DotAIImageOrientation.VERTICAL | ||
| }; | ||
|
|
||
| promptForm.value.emit(formMock); | ||
|
|
||
| expect(store.generateImage).toHaveBeenCalledWith(formMock); | ||
| }); | ||
|
|
||
| it('should inset image', () => { | ||
| const submitBtn = spectator.query(byTestId('submit-btn')); | ||
|
|
||
| spectator.click(submitBtn); | ||
| expect(store.patchState).toHaveBeenCalledWith({ | ||
| selectedImage: imagesMock[0] | ||
| }); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| it('should clear error on hide confirm', () => { | ||
| const dialog = spectator.query(Dialog); | ||
| dialog.onHide.emit('true'); | ||
| expect(store.cleanError).toHaveBeenCalled(); | ||
| }); | ||
| }); |
Oops, something went wrong.