Merge #123

123: Fix plugin failing when single types existed r=bidoubiwa a=bidoubiwa

Before we decide how to handle `single types` in MeiliSearch this PR fixes the issue by removing single types from the types selection in the plugin.

Fixes #122 

open issue: #124 

Co-authored-by: Charlotte Vermandel <[email protected]>
Co-authored-by: cvermand <[email protected]>

Author: bors[bot]

controllers/meilisearch.js

@@ -119,8 +119,18 @@ async function fetchRowBatch({ start, limit, collection }) {
   })
 }
 
+function getCollectionTypes() {
+  const services = strapi.services
+  return Object.keys(services).filter(type => {
+    return services[type].count
+  })
+}
+
 async function numberOfRowsInCollection({ collection }) {
-  return strapi.services[collection].count({ _publicationState: 'preview' })
+  return (
+    strapi.services[collection].count &&
+    strapi.services[collection].count({ _publicationState: 'preview' })
+  )
 }
 
 async function batchAddCollection(ctx) {
@@ -170,7 +180,9 @@ async function getStats({ collection }) {
 async function getCollections() {
   const indexes = await getIndexes()
   const hookedCollections = await getHookedCollections()
-  const collections = Object.keys(strapi.services).map(async collection => {
+  const collectionTypes = getCollectionTypes()
+
+  const collections = collectionTypes.map(async collection => {
     const existInMeilisearch = !!indexes.find(
       index => index.name === collection
     )

playground/.tmp/data.db

@@ -0,0 +1,28 @@
+{
+  "routes": [
+    {
+      "method": "GET",
+      "path": "/single-type-test",
+      "handler": "single-type-test.find",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "PUT",
+      "path": "/single-type-test",
+      "handler": "single-type-test.update",
+      "config": {
+        "policies": []
+      }
+    },
+    {
+      "method": "DELETE",
+      "path": "/single-type-test",
+      "handler": "single-type-test.delete",
+      "config": {
+        "policies": []
+      }
+    }
+  ]
+}

playground/api/single-type-test/config/routes.json

@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/developer-docs/latest/development/backend-customization.html#core-controllers)
+ * to customize this controller
+ */
+
+module.exports = {};

playground/api/single-type-test/controllers/single-type-test.js

@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/developer-docs/latest/development/backend-customization.html#lifecycle-hooks)
+ * to customize this model
+ */
+
+module.exports = {};

playground/api/single-type-test/models/single-type-test.js

@@ -0,0 +1,17 @@
+{
+  "kind": "singleType",
+  "collectionName": "single_type_tests",
+  "info": {
+    "name": "Single Type Test"
+  },
+  "options": {
+    "increments": true,
+    "timestamps": true,
+    "draftAndPublish": true
+  },
+  "attributes": {
+    "title": {
+      "type": "string"
+    }
+  }
+}

playground/api/single-type-test/models/single-type-test.settings.json

@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * Read the documentation (https://strapi.io/documentation/developer-docs/latest/development/backend-customization.html#core-services)
+ * to customize this service
+ */
+
+module.exports = {};

playground/api/single-type-test/services/single-type-test.js

@@ -0,0 +1,13 @@
+{
+  "collectionName": "components_test_component_tests",
+  "info": {
+    "name": "Component-test",
+    "icon": "bong"
+  },
+  "options": {},
+  "attributes": {
+    "title": {
+      "type": "string"
+    }
+  }
+}