@webiny/api-headless-cms-ddb-es 5.19.0-beta.2 → 5.19.0-beta.6

package/helpers/createElasticsearchQueryBody.js

@@ -131,12 +131,8 @@ const createInitialQueryValue = args => {
       }
     });
   } // we do not allow not published and not latest
-  else if (where.published === false) {
-    throw new _error.default(`Cannot call Elasticsearch query with "published" set at false.`, "ELASTICSEARCH_UNSUPPORTED_QUERY", {
-      where
-    });
-  } else if (where.latest === false) {
-    throw new _error.default(`Cannot call Elasticsearch query with "latest" set at false.`, "ELASTICSEARCH_UNSUPPORTED_QUERY", {
+  else {
+    throw new _error.default(`Cannot call Elasticsearch query when not setting "published" or "latest".`, "ELASTICSEARCH_UNSUPPORTED_QUERY", {
       where
     });
   } //

package/operations/entry/index.js

@@ -627,7 +627,7 @@ const createEntriesStorageOperations = params => {
       model
     });
 
-    if (publishedStorageEntry) {
+    if (publishedStorageEntry && publishedStorageEntry.id !== entry.id) {
       /**
        * If there is a `published` entry already, we need to set it to `unpublished`. We need to
        * execute two updates: update the previously published entry's status and the published entry record.

package/operations/model/index.js

@@ -126,7 +126,7 @@ const createModelsStorageOperations = params => {
       }));
       return model;
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not update model.", ex.code || "MODEL_UPDATE_ERROR", {
+      throw new _error.default(ex.message || "Could not update model.", ex.code || "MODEL_UPDATE_ERROR", {
         error: ex,
         model,
         original,
@@ -143,14 +143,35 @@ const createModelsStorageOperations = params => {
 
     try {
       await entity.delete(keys);
-      return model;
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not delete model.", ex.code || "MODEL_DELETE_ERROR", {
+      throw new _error.default(ex.message || "Could not delete model.", ex.code || "MODEL_DELETE_ERROR", {
         error: ex,
         model,
         keys
       });
     }
+
+    const {
+      index
+    } = _configurations.default.es({
+      model
+    });
+    /**
+     * In case of DynamoDB error we need to remove the index we created.
+     */
+
+
+    try {
+      await elasticsearch.indices.delete({
+        index
+      });
+    } catch (ex) {
+      throw new _error.default(`Could not delete elasticsearch index "${index}" after model record was deleted.`, "DELETE_MODEL_INDICE_ERROR", {
+        error: ex
+      });
+    }
+
+    return model;
   };
 
   const get = async params => {
@@ -163,7 +184,7 @@ const createModelsStorageOperations = params => {
       });
       return (0, _cleanup.cleanupItem)(entity, item);
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not get model.", ex.code || "MODEL_GET_ERROR", {
+      throw new _error.default(ex.message || "Could not get model.", ex.code || "MODEL_GET_ERROR", {
         error: ex,
         keys
       });
@@ -186,7 +207,7 @@ const createModelsStorageOperations = params => {
       const items = await (0, _query.queryAll)(queryAllParams);
       return (0, _cleanup.cleanupItems)(entity, items);
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not list models.", ex.code || "MODEL_LIST_ERROR", {
+      throw new _error.default(ex.message || "Could not list models.", ex.code || "MODEL_LIST_ERROR", {
         error: ex,
         partitionKey: queryAllParams.partitionKey
       });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-ddb-es",
-	"version": "5.19.0-beta.2",
+	"version": "5.19.0-beta.6",
 	"main": "index.js",
 	"keywords": [
 		"@webiny/api-headless-cms",
@@ -23,15 +23,15 @@
 	"license": "MIT",
 	"dependencies": {
 		"@babel/runtime": "7.16.3",
-		"@webiny/api-headless-cms": "5.19.0-beta.2",
-		"@webiny/api-upgrade": "5.19.0-beta.2",
-		"@webiny/db-dynamodb": "5.19.0-beta.2",
-		"@webiny/error": "5.19.0-beta.2",
-		"@webiny/handler": "5.19.0-beta.2",
-		"@webiny/handler-aws": "5.19.0-beta.2",
-		"@webiny/handler-db": "5.19.0-beta.2",
-		"@webiny/plugins": "5.19.0-beta.2",
-		"@webiny/utils": "5.19.0-beta.2",
+		"@webiny/api-headless-cms": "5.19.0-beta.6",
+		"@webiny/api-upgrade": "5.19.0-beta.6",
+		"@webiny/db-dynamodb": "5.19.0-beta.6",
+		"@webiny/error": "5.19.0-beta.6",
+		"@webiny/handler": "5.19.0-beta.6",
+		"@webiny/handler-aws": "5.19.0-beta.6",
+		"@webiny/handler-db": "5.19.0-beta.6",
+		"@webiny/plugins": "5.19.0-beta.6",
+		"@webiny/utils": "5.19.0-beta.6",
 		"dataloader": "2.0.0",
 		"dynamodb-toolbox": "0.3.5",
 		"jsonpack": "1.1.5",
@@ -47,10 +47,10 @@
 		"@elastic/elasticsearch": "7.12.0",
 		"@shelf/jest-elasticsearch": "^1.0.0",
 		"@types/jsonpack": "^1.1.0",
-		"@webiny/api-dynamodb-to-elasticsearch": "^5.19.0-beta.2",
-		"@webiny/api-elasticsearch": "^5.19.0-beta.2",
-		"@webiny/cli": "^5.19.0-beta.2",
-		"@webiny/project-utils": "^5.19.0-beta.2",
+		"@webiny/api-dynamodb-to-elasticsearch": "^5.19.0-beta.6",
+		"@webiny/api-elasticsearch": "^5.19.0-beta.6",
+		"@webiny/cli": "^5.19.0-beta.6",
+		"@webiny/project-utils": "^5.19.0-beta.6",
 		"jest": "^26.6.3",
 		"jest-dynalite": "^3.2.0",
 		"jest-environment-node": "^26.6.2",
@@ -69,5 +69,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "6817702cc537405b7288c1fc63ee5d40531b4122"
+	"gitHead": "703856f6067cde3dd2894023f5bba3aaedbf7937"
 }