feat: support for jsonb fields

Along with that * deprecate property.name * remove not needed array helpers in favour of flat module It fixes: #631, #628, #491, #444
SoftwareBrothers · Oct 8, 2020 · bb9de77 · bb9de77
1 parent 34a10bc
commit bb9de77
Show file tree

Hide file tree

Showing 60 changed files with 194 additions and 401 deletions.
diff --git a/src/backend/adapters/resource/base-resource.ts b/src/backend/adapters/resource/base-resource.ts
@@ -171,7 +171,7 @@ class BaseResource {
    *
    * @return  {Promise<Array<BaseRecord>>} records
    */
-  async findMany(ids: Array<string>): Promise<Array<BaseRecord>> {
+  async findMany(ids: Array<string | number>): Promise<Array<BaseRecord>> {
     throw new NotImplementedError('BaseResource#findMany')
   }
 

diff --git a/src/backend/decorators/resource/utils/decorate-properties.ts b/src/backend/decorators/resource/utils/decorate-properties.ts
@@ -3,7 +3,7 @@ import AdminBro from '../../../../admin-bro'
 import { BaseProperty, BaseResource } from '../../../adapters'
 import { PropertyDecorator } from '../../property'
 import { getPropertyByKey } from './get-property-by-key'
-import { pathToParts } from './path-to-parts'
+import { pathToParts } from '../../../../utils/flat/path-to-parts'
 
 export type DecoratedProperties = {[key: string]: PropertyDecorator}
 

diff --git a/src/backend/decorators/resource/utils/find-sub-property.ts b/src/backend/decorators/resource/utils/find-sub-property.ts
@@ -1,5 +1,5 @@
 import PropertyDecorator from '../../property/property-decorator'
-import { PathParts } from './path-parts.type'
+import { PathParts } from '../../../../utils/flat/path-parts.type'
 
 /**
  * @private

diff --git a/src/backend/decorators/resource/utils/get-property-by-key.ts b/src/backend/decorators/resource/utils/get-property-by-key.ts
@@ -1,7 +1,7 @@
 import { PropertyDecorator } from '../../property'
 import { DecoratedProperties } from './decorate-properties'
 import { findSubProperty } from './find-sub-property'
-import { pathToParts } from './path-to-parts'
+import { pathToParts } from '../../../../utils/flat/path-to-parts'
 
 
 export const getPropertyByKey = (

diff --git a/src/backend/decorators/resource/utils/index.ts b/src/backend/decorators/resource/utils/index.ts
@@ -1,7 +1,5 @@
 export * from './find-sub-property'
 export * from './flat-sub-properties'
-export * from './path-to-parts'
-export * from './path-parts.type'
 export * from './get-navigation'
 export * from './decorate-properties'
 export * from './decorate-actions'

diff --git a/src/backend/utils/populator/populate-property.ts b/src/backend/utils/populator/populate-property.ts
@@ -46,7 +46,7 @@ export const populateProperty = async (
     if (property.isArray()) {
       return (foreignKeyValue as Array<string | number>).reduce((arrayMemo, valueInArray) => ({
         ...arrayMemo,
-        ...(isValueSearchable(valueInArray) ? { [valueInArray]: null } : {}),
+        ...(isValueSearchable(valueInArray) ? { [valueInArray]: valueInArray } : {}),
       }), memo)
     }
 
@@ -55,11 +55,11 @@ export const populateProperty = async (
     }
     return {
       ...memo,
-      [foreignKeyValue]: null,
+      [foreignKeyValue]: foreignKeyValue,
     }
   }, {})
 
-  const uniqueExternalIds = Object.keys(externalIdsMap)
+  const uniqueExternalIds = Object.values<string | number>(externalIdsMap)
 
   // when no record has `userId` filled = return input `records`
   if (!uniqueExternalIds.length) {

diff --git a/src/frontend/components/actions/edit.tsx b/src/frontend/components/actions/edit.tsx
@@ -55,7 +55,7 @@ const Edit: FC<ActionProps> = (props) => {
           />
         )) : resource.editProperties.map(property => (
           <PropertyType
-            key={property.name}
+            key={property.path}
             where="edit"
             onChange={handleChange}
             property={property}

diff --git a/src/frontend/components/actions/new.tsx b/src/frontend/components/actions/new.tsx
@@ -59,7 +59,7 @@ const New: FC<ActionProps> = (props) => {
           />
         )) : resource.editProperties.map(property => (
           <PropertyType
-            key={property.name}
+            key={property.path}
             where="edit"
             onChange={handleChange}
             property={property}

diff --git a/src/frontend/components/actions/show.tsx b/src/frontend/components/actions/show.tsx
@@ -30,7 +30,7 @@ const Show: React.FC<ActionProps> = (props) => {
         />
       )) : properties.map(property => (
         <PropertyType
-          key={property.name}
+          key={property.path}
           where="show"
           property={property}
           resource={resource}

diff --git a/src/frontend/components/actions/utils/layout-element-renderer.tsx b/src/frontend/components/actions/utils/layout-element-renderer.tsx
@@ -47,9 +47,9 @@ export const LayoutElementRenderer: React.FC<Props> = (props) => {
   return (
     <Component {...other as any}>
       {properties.map(property => (
-        <DesignSystem.Box flexGrow={1} key={property.name}>
+        <DesignSystem.Box flexGrow={1} key={property.path}>
           <PropertyType
-            key={property.name}
+            key={property.path}
             where={where}
             property={property}
             resource={resource}

diff --git a/src/frontend/components/app/filter-drawer.tsx b/src/frontend/components/app/filter-drawer.tsx
@@ -105,7 +105,7 @@ export const FilterDrawer: React.FC<FilterProps> = (props) => {
         <Box my="x3">
           {properties.map(property => (
             <PropertyType
-              key={property.name}
+              key={property.path}
               where="filter"
               onChange={handleChange}
               property={property}

diff --git a/src/frontend/components/app/records-table/property-header.spec.tsx b/src/frontend/components/app/records-table/property-header.spec.tsx
@@ -56,7 +56,7 @@ describe('<PropertyHeader />', function () {
       const query = new URLSearchParams(href.replace('/?', ''))
 
       expect(query.get('direction')).to.equal('asc')
-      expect(query.get('sortBy')).to.equal(property.name)
+      expect(query.get('sortBy')).to.equal(property.path)
     })
 
     it('doesn\'t render a sort indicator', function () {

diff --git a/src/frontend/components/app/records-table/property-header.tsx b/src/frontend/components/app/records-table/property-header.tsx
@@ -25,7 +25,7 @@ export type PropertyHeaderProps = {
 export const PropertyHeader: React.FC<PropertyHeaderProps> = (props) => {
   const { property, titleProperty, display } = props
 
-  const isMain = property.name === titleProperty.name
+  const isMain = property.path === titleProperty.path
 
   return (
     <TableCell

diff --git a/src/frontend/components/app/records-table/record-in-list.tsx b/src/frontend/components/app/records-table/record-in-list.tsx
@@ -102,15 +102,15 @@ export const RecordInList: React.FC<RecordInListProps> = (props) => {
       {resource.listProperties.map(property => (
         <TableCell
           style={{ cursor: 'pointer' }}
-          key={property.name}
-          data-property-name={property.name}
+          key={property.path}
+          data-property-name={property.path}
           display={display(property.isTitle)}
         >
           {isLoading ? (
             <Placeholder style={{ height: 14 }} />
           ) : (
             <PropertyType
-              key={property.name}
+              key={property.path}
               where="list"
               property={property}
               resource={resource}

diff --git a/src/frontend/components/app/records-table/records-table-header.tsx b/src/frontend/components/app/records-table/records-table-header.tsx
@@ -100,7 +100,7 @@ export const RecordsTableHeader: React.FC<RecordsTableHeaderProps> = (props) =>
         {properties.map(property => (
           <PropertyHeader
             display={display(property.isTitle)}
-            key={property.name}
+            key={property.path}
             titleProperty={titleProperty}
             property={property}
             sortBy={sortBy}

diff --git a/src/frontend/components/app/records-table/records-table.spec.tsx b/src/frontend/components/app/records-table/records-table.spec.tsx
@@ -48,11 +48,11 @@ describe('<RecordsTable />', function () {
   let container: RenderResult['container']
 
   beforeEach(async function () {
-    const name = await factory.build<PropertyJSON>('PropertyJSON', { name: 'name', isTitle: true })
+    const name = await factory.build<PropertyJSON>('PropertyJSON', { path: 'path', isTitle: true })
     properties = [
-      await factory.build<PropertyJSON>('PropertyJSON', { name: 'id', isId: true }),
+      await factory.build<PropertyJSON>('PropertyJSON', { path: 'id', isId: true }),
       name,
-      await factory.build<PropertyJSON>('PropertyJSON', { name: 'surname' }),
+      await factory.build<PropertyJSON>('PropertyJSON', { path: 'surname' }),
     ]
     resource = await factory.build<ResourceJSON>('ResourceJSON', {
       listProperties: properties,

diff --git a/src/frontend/components/app/sort-link.tsx b/src/frontend/components/app/sort-link.tsx
@@ -21,7 +21,7 @@ class SortLink extends React.PureComponent<SortLinkProps & RouteComponentProps>
 
   isActive(): boolean {
     const { sortBy, property } = this.props
-    return sortBy === property.name
+    return sortBy === property.path
   }
 
   render(): ReactNode {
@@ -31,7 +31,7 @@ class SortLink extends React.PureComponent<SortLinkProps & RouteComponentProps>
     const sortedByIcon = `Caret${direction === 'asc' ? 'Up' : 'Down'}`
 
     query.set('direction', oppositeDirection)
-    query.set('sortBy', property.name)
+    query.set('sortBy', property.path)
 
     return (
       <NavLink to={{ search: query.toString() }} className={cssClass('SortLink')}>

diff --git a/src/frontend/components/property-type/array/add-new-item-translation.tsx b/src/frontend/components/property-type/array/add-new-item-translation.tsx
@@ -13,7 +13,7 @@ const AddNewItemButton: React.FC<AddNewItemButtonProps> = (props) => {
   const { resource, property } = props
   const { translateProperty, translateButton } = useTranslation()
   const label = translateProperty(
-    `${property.name}.addNewItem`,
+    `${property.path}.addNewItem`,
     resource.id, {
       defaultValue: translateButton('addNewItem', resource.id),
     },

diff --git a/src/frontend/components/property-type/array/convert-params-to-array-items.spec.js b/src/frontend/components/property-type/array/convert-params-to-array-items.spec.js
diff --git a/src/frontend/components/property-type/array/convert-params-to-array-items.ts b/src/frontend/components/property-type/array/convert-params-to-array-items.ts