#24797 Filtering the current identifier

dotCMS · May 3, 2023 · bda0c67 · bda0c67
1 parent 6ef4fa8
commit bda0c67
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/core-web/libs/block-editor/src/lib/components/dot-block-editor/dot-block-editor.component.ts b/core-web/libs/block-editor/src/lib/components/dot-block-editor/dot-block-editor.component.ts
@@ -72,6 +72,7 @@ export class DotBlockEditorComponent implements OnInit, OnDestroy {
     @Input() charLimit: number;
     @Input() customBlocks = '';
     @Input() content: Content = '';
+    @Input() identifier: string;
     @Input() set showVideoThumbnail(value) {
         this.dotMarketingConfigService.setProperty(
             EDITOR_MARKETING_KEYS.SHOW_VIDEO_THUMBNAIL,
@@ -357,7 +358,8 @@ export class DotBlockEditorComponent implements OnInit, OnDestroy {
             DotConfigExtension({
                 lang: this.lang,
                 allowedContentTypes: this.allowedContentTypes,
-                allowedBlocks: this._allowedBlocks
+                allowedBlocks: this._allowedBlocks,
+                identifier: this.identifier
             }),
             DotComands,
             DotPlaceholder.configure({ placeholder: 'Type "/" for commands' }),

diff --git a/core-web/libs/block-editor/src/lib/extensions/action-button/actions-menu.extension.ts b/core-web/libs/block-editor/src/lib/extensions/action-button/actions-menu.extension.ts
@@ -250,7 +250,7 @@ export const ActionsMenu = (
     }
 
     function setUpSuggestionComponent(editor: Editor, range: Range) {
-        const { allowedBlocks, allowedContentTypes, lang } = editor.storage.dotConfig;
+        const { allowedBlocks, allowedContentTypes, lang, identifier } = editor.storage.dotConfig;
         const editorAllowedBlocks = allowedBlocks.length > 1 ? allowedBlocks : [];
         const items = getItems({ allowedBlocks: editorAllowedBlocks, editor, range });
 
@@ -260,6 +260,8 @@ export const ActionsMenu = (
         suggestionsComponent.instance.items = items;
         suggestionsComponent.instance.currentLanguage = lang;
         suggestionsComponent.instance.allowedContentTypes = allowedContentTypes;
+        suggestionsComponent.instance.identifier = identifier;
+
         suggestionsComponent.instance.onSelectContentlet = (props) => {
             clearFilter({ type: ItemsType.CONTENT, editor, range, suggestionKey, ItemsType });
             onSelection({ editor, range, props });

diff --git a/core-web/libs/block-editor/src/lib/extensions/bubble-menu/models/index.ts b/core-web/libs/block-editor/src/lib/extensions/bubble-menu/models/index.ts
@@ -16,6 +16,7 @@ export interface ContentletFilters {
     contentType: string;
     filter: string;
     currentLanguage: number;
+    identifier: string;
 }
 
 export enum NodeTypes {

diff --git a/core-web/libs/block-editor/src/lib/extensions/dot-config/models/index.ts b/core-web/libs/block-editor/src/lib/extensions/dot-config/models/index.ts
@@ -2,4 +2,5 @@ export interface DotConfigModel {
     lang: number;
     allowedContentTypes: string;
     allowedBlocks: string[];
+    identifier: string;
 }
diff --git a/core-web/libs/block-editor/src/lib/shared/components/suggestions/suggestions.component.ts b/core-web/libs/block-editor/src/lib/shared/components/suggestions/suggestions.component.ts
@@ -50,6 +50,7 @@ export class SuggestionsComponent implements OnInit {
     @Input() noResultsMessage = 'No Results';
     @Input() currentLanguage = DEFAULT_LANG_ID;
     @Input() allowedContentTypes = '';
+    @Input() identifier = '';
 
     private itemsLoaded: ItemsType;
     private selectedContentType: DotCMSContentType;
@@ -199,7 +200,8 @@ export class SuggestionsComponent implements OnInit {
             .getContentlets({
                 contentType: contentType.variable,
                 filter,
-                currentLanguage: this.currentLanguage
+                currentLanguage: this.currentLanguage,
+                identifier: this.identifier
             })
             .pipe(take(1))
             .subscribe((contentlets) => {

diff --git a/core-web/libs/block-editor/src/lib/shared/services/suggestions/suggestions.service.ts b/core-web/libs/block-editor/src/lib/shared/services/suggestions/suggestions.service.ts
@@ -37,11 +37,14 @@ export class SuggestionsService {
     getContentlets({
         contentType,
         filter,
-        currentLanguage
+        currentLanguage,
+        identifier
     }: ContentletFilters): Observable<DotCMSContentlet[]> {
+        const identifierQuery = identifier ? `-identifier:${identifier}` : '';
+
         return this.http
             .post('/api/content/_search', {
-                query: `+contentType:${contentType} +languageId:${currentLanguage} +deleted:false +working:true +catchall:*${filter}* `,
+                query: `+contentType:${contentType}  ${identifierQuery}  +languageId:${currentLanguage} +deleted:false +working:true +catchall:*${filter}* `,
                 sort: 'modDate desc',
                 offset: 0,
                 limit: 40

diff --git a/dotCMS/src/main/webapp/html/dotcms-block-editor.js b/dotCMS/src/main/webapp/html/dotcms-block-editor.js
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp
@@ -164,6 +164,7 @@
             String displayCountBar = "";
             String charLimit = "";
             String customBlocks = "";
+            String identifier = contentlet.getIdentifier();
             Boolean showVideoThumbnail = Config.getBooleanProperty("SHOW_VIDEO_THUMBNAIL", true);
 
             // By default this is an empty JSON `{}`.
@@ -208,7 +209,10 @@
                 display-count-bar="<%=displayCountBar%>"
                 char-limit="<%=charLimit%>"
                 lang="<%=contentLanguage%>"
-                custom-blocks='<%=customBlocks%>'>
+                custom-blocks='<%=customBlocks%>'
+                identifier='<%=identifier%>'
+            >
+
             </dotcms-block-editor>
             <input type="hidden" name="<%=field.getFieldContentlet()%>" id="editor-input-value-<%=field.getVelocityVarName()%>"/>