Skip to content

Commit 3640bcd

Browse files
authored
fix (edit content) : 31939 - remove back button / 31903 - preview buttons fixes (dotCMS#32135)
### Proposed Changes * Preview buttons fix in files and image content types. * Remove the back button. ### Screenshots <img width="843" alt="Image" src="https://github.com/user-attachments/assets/4caf0348-4d9e-4b51-9108-9a46208275b2" /> <img width="885" alt="Image" src="https://github.com/user-attachments/assets/cd60bd3a-9232-49e3-9867-774cae5dfbb8" />
1 parent 7874de1 commit 3640bcd

File tree

5 files changed

+10
-57
lines changed

5 files changed

+10
-57
lines changed

core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.html

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@
3131
scrollable="false"
3232
class="dot-edit-content-tabview">
3333
<!-- Add prepend and append areas to the tabs -->
34-
<ng-template
35-
dotTabViewInsert
36-
[dotTabViewPrepend]="prependContent"
37-
[dotTabViewAppend]="appendContent"></ng-template>
34+
<ng-template dotTabViewInsert [dotTabViewAppend]="appendContent"></ng-template>
3835

3936
<!-- Tabs are lazy -->
4037
@for (tab of tabs; track tab) {
@@ -69,18 +66,6 @@
6966
</form>
7067
}
7168

72-
<!-- Prepend template to add to the tabs-->
73-
<ng-template #prependContent>
74-
<div class="back-button__wrapper h-100 flex">
75-
<button
76-
data-testId="back-button"
77-
pButton
78-
(click)="goBack()"
79-
icon="pi pi-chevron-left"
80-
class="p-button-tertiary p-button-rounded p-button-sm"></button>
81-
</div>
82-
</ng-template>
83-
8469
<!-- Append template to add to the tabs -->
8570
<ng-template #appendContent>
8671
<div

core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ $tab-min-height: 52px;
9292
}
9393
.dot-edit-content-tabview {
9494
.p-tabview-nav-container {
95-
padding: 0 0 0 $spacing-4;
95+
padding: 0;
9696
border-bottom: solid 1px $color-palette-gray-300;
9797
border-right: none;
9898
overflow: initial;
@@ -106,7 +106,6 @@ $tab-min-height: 52px;
106106
border: none;
107107
border-left: solid 1px $color-palette-gray-300;
108108
border-right: solid 1px $color-palette-gray-300;
109-
padding-left: $spacing-3;
110109
min-height: $tab-min-height;
111110
min-width: auto;
112111
}

core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import {
4646

4747
import { DotEditContentFormComponent } from './dot-edit-content-form.component';
4848

49-
import { CONTENT_SEARCH_ROUTE } from '../../models/dot-edit-content-field.constant';
5049
import { DotEditContentService } from '../../services/dot-edit-content.service';
5150
import { DotEditContentStore } from '../../store/edit-content.store';
5251
import {
@@ -69,7 +68,6 @@ describe('DotFormComponent', () => {
6968
let dotEditContentService: SpyObject<DotEditContentService>;
7069
let dotWorkflowService: SpyObject<DotWorkflowService>;
7170
let dotContentletService: SpyObject<DotContentletService>;
72-
let router: SpyObject<Router>;
7371

7472
const createComponent = createComponentFactory({
7573
component: DotEditContentFormComponent,
@@ -128,7 +126,6 @@ describe('DotFormComponent', () => {
128126
workflowActionsFireService = spectator.inject(DotWorkflowActionsFireService);
129127
dotWorkflowService = spectator.inject(DotWorkflowService);
130128
dotContentletService = spectator.inject(DotContentletService);
131-
router = spectator.inject(Router);
132129
});
133130

134131
afterEach(() => {
@@ -274,19 +271,11 @@ describe('DotFormComponent', () => {
274271
expect(tabPanels[1]._header).toBe('New Tab');
275272
});
276273

277-
it('should have append and prepend areas', () => {
278-
const prependArea = spectator.query(byTestId('tabview-prepend-content'));
274+
it('should have append area', () => {
279275
const appendArea = spectator.query(byTestId('tabview-append-content'));
280-
expect(prependArea).toBeTruthy();
281276
expect(appendArea).toBeTruthy();
282277
});
283278

284-
it('should render back button in prepend area', () => {
285-
const backButton = spectator.query(byTestId('back-button'));
286-
expect(backButton).toBeTruthy();
287-
expect(backButton.getAttribute('icon')).toBe('pi pi-chevron-left');
288-
});
289-
290279
it('should render workflow actions and sidebar toggle in append area', () => {
291280
const sidebarButton = spectator.query(byTestId('sidebar-toggle-button'));
292281
const workflowActions = spectator.query(DotWorkflowActionsComponent);
@@ -306,26 +295,6 @@ describe('DotFormComponent', () => {
306295
expect(toggleSidebarSpy).toHaveBeenCalled();
307296
});
308297

309-
it('should call toggleSidebar when sidebar toggle button is clicked', () => {
310-
const toggleSidebarSpy = jest.spyOn(store, 'toggleSidebar');
311-
312-
const sidebarToggleButton = spectator.query(byTestId('sidebar-toggle-button'));
313-
expect(sidebarToggleButton).toBeTruthy();
314-
315-
spectator.click(sidebarToggleButton);
316-
317-
expect(toggleSidebarSpy).toHaveBeenCalled();
318-
319-
const backButton = spectator.query(byTestId('back-button'));
320-
expect(backButton).toBeTruthy();
321-
322-
spectator.click(backButton);
323-
324-
expect(router.navigate).toHaveBeenCalledWith([CONTENT_SEARCH_ROUTE], {
325-
queryParams: { filter: MOCK_CONTENTTYPE_2_TABS.variable }
326-
});
327-
});
328-
329298
describe('TabView Styling', () => {
330299
it('should apply single-tab class when only one tab exists', () => {
331300
const tabView = spectator.query('.dot-edit-content-tabview');

core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,23 @@
7979
@if (isEditable) {
8080
<p-button
8181
(click)="onEdit()"
82-
styleClass="p-button-rounded p-button-text p-button-semi-transparent"
82+
styleClass="p-button-rounded p-button-sm p-button-tertiary"
8383
data-testId="edit-button-responsive"
8484
icon="pi pi-pencil"></p-button>
8585
}
8686
<p-button
8787
(click)="visibility = !visibility"
88-
styleClass="p-button-rounded p-button-text p-button-semi-transparent"
88+
styleClass="p-button-rounded p-button-sm p-button-tertiary"
8989
data-testId="infor-button-responsive"
9090
icon="pi pi-info"></p-button>
9191
<p-button
9292
(click)="downloadAsset()"
93-
styleClass="p-button-rounded p-button-text p-button-semi-transparent"
93+
styleClass="p-button-rounded p-button-sm p-button-tertiary"
9494
data-testId="download-btn-responsive"
9595
icon="pi pi-download" />
9696
<p-button
9797
(click)="removeFile.emit()"
98-
styleClass="p-button-rounded p-button-text p-button-semi-transparent"
98+
styleClass="p-button-rounded p-button-sm p-button-tertiary"
9999
data-testId="remove-button-responsive"
100100
icon="pi pi-trash"></p-button>
101101
</div>

core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/components/dot-file-field-preview/dot-file-field-preview.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,19 @@
7575
<div class="preview-metadata__action--responsive">
7676
<p-button
7777
(click)="toggleShowDialog()"
78-
styleClass="p-button-rounded"
78+
styleClass="p-button-rounded p-button-sm p-button-tertiary"
7979
data-testId="info-btn-responsive"
8080
icon="pi pi-info" />
8181
@if (fileInfo.downloadLink) {
8282
<p-button
83-
styleClass="p-button-rounded"
83+
styleClass="p-button-rounded p-button-sm p-button-tertiary"
8484
data-testId="download-btn-responsive"
8585
icon="pi pi-download"
8686
(click)="downloadAsset(fileInfo.downloadLink)" />
8787
}
8888
<p-button
8989
(click)="removeFile.emit()"
90-
styleClass="p-button-rounded "
90+
styleClass="p-button-rounded p-button-sm p-button-tertiary"
9191
data-testId="remove-button-responsive"
9292
icon="pi pi-trash" />
9393
</div>

0 commit comments

Comments
 (0)