fix: objects not being included in schema

admin/src/components/SchemaMapper/index.js

@@ -14,7 +14,7 @@ import {
   Typography
 } from '@strapi/design-system'
 import WarningIcon from '../WarningIcon'
-import { getSchemaFromAttributes, getSelectedAttributesFromSchema } from '../../../../utils/schema'
+import { getSelectedPropsFromObj, getSelectedAttributesFromSchema } from '../../../../utils/schema'
 
 const isCollection = (value) => Array.isArray(value) && value.length > 0 && typeof value[0] === 'object'
 
@@ -63,9 +63,9 @@ const SchemaMapper = ({ collection, contentTypeSchema, onSchemaChange }) => {
   })
 
   React.useEffect(() => {
-    const schema = getSchemaFromAttributes({
-      attributes: selectedAttributes,
-      schema: contentTypeSchema
+    const schema = getSelectedPropsFromObj({
+      props: selectedAttributes,
+      obj: contentTypeSchema
     })
 
     onSchemaChange({ schema, searchableAttributes })

admin/src/pages/PluginSettings/index.js

@@ -22,7 +22,7 @@ import pluginId from '../../pluginId'
 import CollectionForm from '../../components/CollectionForm'
 
 const isValidCollection = (collections, newCollection) => {
-  if (collections.some((col) => col.indexId === newCollection.indexId)) {
+  if (collections.filter((col) => col.indexId === newCollection.indexId).length > 1) {
     return {
       error: 'Index ID must be unique'
     }
@@ -189,7 +189,7 @@ const HomePage = () => {
   }
 
   const handleUpdate = async () => {
-    const { error } = isValidCollection(currentCollection)
+    const { error } = isValidCollection(collections, currentCollection)
     if (error) {
       return onValidateError(error)
     }

server/services/orama-manager.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { CloudManager } = require('@oramacloud/client')
-const { getSchemaFromEntryStructure } = require('../../utils/schema')
+const { getSchemaFromEntryStructure, getSelectedPropsFromObj } = require('../../utils/schema')
 
 class OramaManager {
   constructor({ strapi }) {
@@ -53,19 +53,6 @@ class OramaManager {
     return true
   }
 
-  /*
-   * Filters out non-searchable attributes from an entry
-   * @param {Object} entry - Entry object
-   * */
-  filterOutNonSearchableAttributes(entry, searchableAttributes) {
-    return Object.entries(entry).reduce((acc, [key, value]) => {
-      if (searchableAttributes.includes(key)) {
-        acc[key] = value
-      }
-      return acc
-    }, {})
-  }
-
   /*
    * Transforms the documents before inserting them into the index
    * The transformer function is defined in the collection settings
@@ -163,10 +150,7 @@ class OramaManager {
     if (entries.length > 0) {
       if (offset === 0) {
         const transformedEntries = this.documentsTransformer(collection.indexId, entries)
-        const filteredEntry = this.filterOutNonSearchableAttributes(
-          transformedEntries[0],
-          collection.searchableAttributes
-        )
+        const filteredEntry = getSelectedPropsFromObj({ props: collection.searchableAttributes, obj: transformedEntries[0] })
 
         await this.oramaUpdateSchema({
           indexId: collection.indexId,

server/services/orama-manager.test.js

@@ -116,14 +116,6 @@ describe('OramaManager', () => {
     })
   })
 
-  describe('filterOutNonSearchableAttributes', () => {
-    it('should filter out non searchable attributes', () => {
-      const result = oramaManager.filterOutNonSearchableAttributes({ id: '2', title: 'hello' }, ['title'])
-
-      expect(result).toEqual({ title: 'hello' })
-    })
-  })
-
   describe('documentsTransformer', () => {
     it('should return entries if no transformer functions are found', () => {
       const result = oramaManager.documentsTransformer('unknown', [{ id: 1, title: 'Test Entry' }])

utils/schema.js

@@ -1,14 +1,14 @@
-const getSchemaFromAttributes = ({ attributes, schema }) => {
-  return attributes.reduce((acc, field) => {
+const getSelectedPropsFromObj = ({ props, obj }) => {
+  return props.reduce((acc, field) => {
     if (field.includes('.')) {
       const [parent, child] = field.split('.')
       if (!acc[parent]) {
         acc[parent] = {}
       }
 
-      acc[parent][child] = schema[parent][child]
+      acc[parent][child] = obj[parent][child]
     } else {
-      acc[field] = schema[field]
+      acc[field] = obj[field]
     }
     return acc
   }, {})
@@ -42,7 +42,7 @@ const getSchemaFromEntryStructure = (entry) => {
 }
 
 module.exports = {
-  getSchemaFromAttributes,
+  getSelectedPropsFromObj,
   getSelectedAttributesFromSchema,
   getSchemaFromEntryStructure
 }

utils/schema.test.js

@@ -1,31 +1,31 @@
-const { getSchemaFromAttributes, getSelectedAttributesFromSchema, getSchemaFromEntryStructure } = require('./schema')
+const { getSelectedPropsFromObj, getSelectedAttributesFromSchema, getSchemaFromEntryStructure } = require('./schema')
 
 describe('Schema Utils', () => {
-  describe('getSchemaFromAttributes', () => {
+  describe('getSelectedPropsFromObj', () => {
     it('should return the correct schema for flat attributes', () => {
-      const attributes = ['name', 'age']
-      const schema = {
+      const props = ['name', 'age']
+      const obj = {
         name: { type: 'string' },
         age: { type: 'number' },
         address: { type: 'object' }
       }
-      const result = getSchemaFromAttributes({ attributes, schema })
+      const result = getSelectedPropsFromObj({ props, obj })
       expect(result).toEqual({
         name: { type: 'string' },
         age: { type: 'number' }
       })
     })
 
     it('should return the correct schema for nested attributes', () => {
-      const attributes = ['address.city', 'address.zip']
-      const schema = {
+      const props = ['address.city', 'address.zip']
+      const obj = {
         address: {
           city: { type: 'string' },
           zip: { type: 'number' },
           street: { type: 'string' }
         }
       }
-      const result = getSchemaFromAttributes({ attributes, schema })
+      const result = getSelectedPropsFromObj({ props, obj })
       expect(result).toEqual({
         address: {
           city: { type: 'string' },