#24292 include in 23.01.9

dotCMS · Nov 17, 2023 · 35bd994 · 35bd994
1 parent a82a9a4
commit 35bd994
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...-ui/src/app/portlets/dot-edit-page/components/dot-palette/store/dot-palette.store.spec.ts b/...-ui/src/app/portlets/dot-edit-page/components/dot-palette/store/dot-palette.store.spec.ts
@@ -181,7 +181,9 @@ describe('DotPaletteStore', () => {
     it('should load inly widgets to store if allowedContent is empty', (done) => {
         const sortedDataMock = contentTypeDataMock.sort((a, b) => a.name.localeCompare(b.name));
         spyOn(dotContentTypeService, 'filterContentTypes').and.returnValues(of([]));
-        spyOn(dotContentTypeService, 'getContentTypes').and.returnValues(of(sortedDataMock as DotCMSContentType[]));
+        spyOn(dotContentTypeService, 'getContentTypes').and.returnValues(
+            of(sortedDataMock as DotCMSContentType[])
+        );
         dotPaletteStore.loadContentTypes([]);
         dotPaletteStore.vm$.subscribe((data) => {
             expect(data.contentTypes).toEqual(sortedDataMock as DotCMSContentType[]);
@@ -231,7 +233,7 @@ describe('DotPaletteStore', () => {
                 lang: '1',
                 filter: '',
                 offset: '0',
-                query: '+contentType: product'
+                query: '+contentType: product +deleted: false'
             });
             expect(data.contentlets).toEqual([
                 contentletProductDataMock
@@ -301,4 +303,4 @@ describe('DotPaletteStore', () => {
         expect(dotContentTypeService.filterContentTypes).not.toHaveBeenCalled();
         expect(dotContentTypeService.getContentTypes).not.toHaveBeenCalled();
     }));
-});
+});
diff --git a/...otcms-ui/src/app/portlets/dot-edit-page/components/dot-palette/store/dot-palette.store.ts b/...otcms-ui/src/app/portlets/dot-edit-page/components/dot-palette/store/dot-palette.store.ts
@@ -188,7 +188,7 @@ export class DotPaletteStore extends ComponentStore<DotPaletteState> {
                         lang: languageId || '1',
                         filter: filter || '',
                         offset: (event && event.first.toString()) || '0',
-                        query: `+contentType: ${this.contentTypeVarName}`
+                        query: `+contentType: ${this.contentTypeVarName} +deleted: false`
                     })
                     .pipe(take(1))
                     .subscribe((response: ESContent) => {

diff --git a/hotfix_tracking.md b/hotfix_tracking.md
@@ -163,3 +163,4 @@ This maintenance release includes the following code fixes:
 133. https://github.com/dotCMS/core/issues/24227 : [SASS] : Minify CSS output by default #24227
 134. https://github.com/dotCMS/core/issues/24266 : Content Type publish and expire date are set to empty #24266
 135. https://github.com/dotCMS/core/issues/24291 : Ensure that sessions can be serialized and replicated across servers #24291
+136. https://github.com/dotCMS/core/issues/24292 : Content Palette Should Not Show Archived Content #24292