@vegan-friendly/strapi-plugin-elasticsearch 0.2.4-alpha.1 → 0.2.5

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vegan-friendly/strapi-plugin-elasticsearch",
-    "version": "0.2.4-alpha.1",
+    "version": "0.2.4",
     "description": "A Strapi plugin to enable using Elasticsearch with Strapi CMS.",
     "homepage": "https://github.com/vegan-friendly/strapi-plugin-elasticsearch",
     "strapi": {

package/dist/server/index.d.ts

@@ -151,7 +151,7 @@ declare const _default: {
             strapi: any;
         }) => {
             rebuildIndex(): Promise<boolean>;
-            indexCollection(collectionName: any, indexName?: null): Promise<boolean>;
+            indexCollection(collectionName: any, indexName?: string | null): Promise<boolean>;
             indexPendingData(): Promise<boolean>;
         };
         logIndexing: ({ strapi }: {

package/dist/server/services/es-interface.js

@@ -114,7 +114,8 @@ exports.default = ({ strapi }) => ({
                 id: itemId,
                 document: itemData,
             });
-            await client.indices.refresh({ index: iName });
+            //indices.refresh is an expensive operation. and ES is doing this once a second anyway (see https://www.elastic.co/guide/en/elasticsearch/reference/8.17/indices-refresh.html)
+            // await client!.indices.refresh({ index: iName });
         }
         catch (err) {
             console.log('strapi-plugin-elasticsearch : Error encountered while indexing data to ElasticSearch.');
@@ -126,14 +127,13 @@ exports.default = ({ strapi }) => ({
         const pluginConfig = await strapi.config.get('plugin.elasticsearch');
         return await this.indexDataToSpecificIndex({ itemId, itemData }, pluginConfig.indexAliasName);
     },
-    async removeItemFromIndex({ itemId }) {
-        const pluginConfig = await strapi.config.get('plugin.elasticsearch');
+    async removeItemFromIndex({ indexName, itemId }) {
         try {
             await client.delete({
-                index: pluginConfig.indexAliasName,
+                index: indexName,
                 id: itemId,
             });
-            await client.indices.refresh({ index: pluginConfig.indexAliasName });
+            await client.indices.refresh({ index: indexName });
         }
         catch (err) {
             if (err?.meta?.statusCode === 404)

package/dist/server/services/index.d.ts

@@ -47,7 +47,7 @@ declare const _default: {
         strapi: any;
     }) => {
         rebuildIndex(): Promise<boolean>;
-        indexCollection(collectionName: any, indexName?: null): Promise<boolean>;
+        indexCollection(collectionName: any, indexName?: string | null): Promise<boolean>;
         indexPendingData(): Promise<boolean>;
     };
     logIndexing: ({ strapi }: {

package/dist/server/services/perform-indexing.d.ts

@@ -2,7 +2,7 @@ declare const _default: ({ strapi }: {
     strapi: any;
 }) => {
     rebuildIndex(): Promise<boolean>;
-    indexCollection(collectionName: any, indexName?: null): Promise<boolean>;
+    indexCollection(collectionName: any, indexName?: string | null): Promise<boolean>;
     indexPendingData(): Promise<boolean>;
 };
 export default _default;

package/dist/server/services/perform-indexing.js

@@ -101,6 +101,7 @@ exports.default = ({ strapi }) => ({
         const logIndexingService = strapi.plugins['elasticsearch'].services.logIndexing;
         const esInterface = strapi.plugins['elasticsearch'].services.esInterface;
         const helper = strapi.plugins['elasticsearch'].services.helper;
+        const indexAlias = await strapi.config.get('plugin.elasticsearch').indexAliasName;
         const recs = await scheduleIndexingService.getItemsPendingToBeIndexed();
         const fullSiteIndexing = recs.filter((r) => r.full_site_indexing === true).length > 0;
         if (fullSiteIndexing) {
@@ -137,7 +138,7 @@ exports.default = ({ strapi }) => ({
                                     collectionName: col,
                                     itemId: recs[r].item_id,
                                 });
-                                await esInterface.removeItemFromIndex({ itemId: indexItemId });
+                                await esInterface.removeItemFromIndex({ indexName: indexAlias, itemId: indexItemId });
                                 await scheduleIndexingService.markIndexingTaskComplete(recs[r].id);
                             }
                         } //index the entire collection

package/dist/server/services/virtual-collections-indexer.js

@@ -22,7 +22,7 @@ exports.default = ({ strapi }) => {
                 throw new Error(`Virtual collection not found: ${collectionName}`);
             }
             try {
-                const results = await collection.extractById([itemId]);
+                const results = await collection.extractByIds([itemId]);
                 if (!results || !Array.isArray(results) || results.length === 0) {
                     strapi.log.warn(`No data extracted for ${collectionName} with ID ${itemId}`);
                     return null;
@@ -113,15 +113,25 @@ exports.default = ({ strapi }) => {
             const { model, result } = event;
             const registry = getRegistryService();
             // Find virtual collections that should be triggered by this model
-            const affectedCollections = registry.findTriggersByCollection(model);
+            const affectedCollections = registry.findTriggersByCollection(model.uid);
             for (const collection of affectedCollections) {
                 // Find the specific trigger for this collection
-                const trigger = collection.triggers.find((t) => t.collection === model);
-                if (trigger && trigger.getIdsToReindex) {
-                    // Get IDs that need to be reindexed
-                    const idsToReindex = await trigger.getIdsToReindex(result);
-                    // Reindex each item
-                    for (const id of idsToReindex) {
+                const trigger = collection.triggers.find((t) => t.collection === model.uid);
+                const triggerIsOnIndexCollection = model.uid === collection.collectionName;
+                if (trigger?.getIdsToReindex == null) {
+                    strapi.log.error(`Trigger for ${collection.collectionName} (triggered by ${model.uid}) does not have getIdsToReindex function.`);
+                    return;
+                }
+                // Get IDs that need to be reindexed
+                const idsToReindex = await trigger.getIdsToReindex(result);
+                // Reindex each item
+                for (const id of idsToReindex) {
+                    const isDelete = event.action?.toLowerCase()?.includes('delete') && triggerIsOnIndexCollection && id === result.id;
+                    if (isDelete) {
+                        //delete the item from the index, if the item being delete is the one being reindexed
+                        await this.deleteItem(collection.collectionName, id);
+                    }
+                    else {
                         await this.indexItem(collection.collectionName, id);
                     }
                 }
@@ -132,13 +142,16 @@ exports.default = ({ strapi }) => {
          */
         async deleteItem(collectionName, itemId) {
             const registry = getRegistryService();
+            const helper = getHelperService();
             const collection = registry.get(collectionName);
             if (!collection) {
                 throw new Error(`Virtual collection not found: ${collectionName}`);
             }
             try {
                 const esInterface = getElasticsearchService();
-                await esInterface.removeItemFromIndex({ itemId });
+                const indexItemId = helper.getIndexItemId({ collectionName, itemId });
+                const indexName = collection.indexAlias || (await helper.getCurrentIndexName());
+                await esInterface.removeItemFromIndex({ indexName, itemId: indexItemId });
                 strapi.log.debug(`Deleted indexed item: ${collectionName}:${itemId}`);
                 return true;
             }

package/dist/server/types/esInterface.type.d.ts

@@ -61,6 +61,7 @@ export interface EsInterfaceService {
      * @returns A promise that resolves when the item is removed.
      */
     removeItemFromIndex(data: {
+        indexName: string;
         itemId: string;
     }): Promise<any>;
     /**

package/dist/server/types/helper-service.type.d.ts

@@ -21,8 +21,8 @@ export interface HelperService {
         collectionName: string;
         itemId: number;
     }): string;
-    getCurrentIndexName(indexAlias?: string): Promise<string>;
-    getIncrementedIndexName(indexPrefix: string): Promise<string>;
+    getCurrentIndexName(indexPrefix?: string): Promise<string>;
+    getIncrementedIndexName(indexPrefix?: string): Promise<string>;
     deleteOldIndices(indexAlias?: string): Promise<string[]>;
     modifySubfieldsConfigForExtractor(collectionConfig: object): object;
     extractDataToIndex(args: {

package/dist/server/types/virtual-collections.type.d.ts

@@ -13,7 +13,7 @@ export type VirtualCollectionConfig<T extends StrapiEntity> = {
     indexAlias?: string;
     collectionName: string;
     extractData: (page: number, pageSize?: number) => Promise<T[]>;
-    extractById: (ids: number[]) => Promise<T[]>;
+    extractByIds: (ids: number[]) => Promise<T[]>;
     triggers: Array<{
         collection: string;
         getIdsToReindex: (result: any) => Promise<number[]>;
@@ -70,5 +70,5 @@ export interface VirtualCollectionsIndexerService {
      * @param itemId - The id of the item to be deleted.
      * @returns A promise that resolves to a boolean indicating success.
      */
-    deleteItem(collectionName: string, itemId: string): Promise<boolean>;
+    deleteItem(collectionName: string, itemId: number): Promise<boolean>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vegan-friendly/strapi-plugin-elasticsearch",
-  "version": "0.2.4-alpha.1",
+  "version": "0.2.5",
   "description": "A Strapi plugin to enable using Elasticsearch with Strapi CMS.",
   "homepage": "https://github.com/vegan-friendly/strapi-plugin-elasticsearch",
   "strapi": {