feat(keystone): DOMA-10804 some fixes

open-condo-software · Jan 24, 2025 · da8fefe · da8fefe
1 parent 8c22dc5
commit da8fefe
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/packages/keystone/fields/CloudStorageText/Implementation.js b/packages/keystone/fields/CloudStorageText/Implementation.js
@@ -7,6 +7,25 @@ class CloudStorageTextImplementation extends Text.implementation {
         super(...arguments)
         this.fileAdapter = adapter
         this.isMultiline = true
+        this.isOrderable = false
+    }
+    equalityInputFields () {
+        return []
+    }
+    equalityInputFieldsInsensitive () {
+        return []
+    }
+    inInputFields () {
+        return []
+    }
+    orderingInputFields () {
+        return []
+    }
+    stringInputFields () {
+        return []
+    }
+    stringInputFieldsInsensitive () {
+        return []
     }
 }
 

diff --git a/packages/keystone/fields/CloudStorageText/adapters/index.js b/packages/keystone/fields/CloudStorageText/adapters/index.js
@@ -1,9 +1,10 @@
 const { Text } = require('@keystonejs/fields')
 const cuid = require('cuid')
-const isNil = require('lodash/isNil')
 
+const { CLOUD_STORAGE_TEXT_MIMETYPE, CLOUD_STORAGE_TEXT_ENCODING } = require('@open-condo/keystone/fields/CloudStorageText/constants')
 const { bufferToStream, readFileFromStream, getObjectStream } = require('@open-condo/keystone/file')
 
+
 const CommonInterface = superclass => class extends superclass {
 
     constructor () {
@@ -16,7 +17,7 @@ const CommonInterface = superclass => class extends superclass {
 
     setupHooks ({ addPreSaveHook, addPostReadHook }) {
         addPreSaveHook(async (item) => {
-            if (this._isFieldDefined(item)) {
+            if (item[this.path]) {
                 item[this.path] = await this._saveFileToAdapter(item[this.path])
             }
             return item
@@ -30,30 +31,24 @@ const CommonInterface = superclass => class extends superclass {
         })
     }
 
-    _isFieldDefined (item) {
-        return item && !isNil(item[this.path])
-    }
-
     async _saveFileToAdapter (content) {
         const stream = bufferToStream(content)
-        const originalFilename = this._generateFilename()
-        const mimetype = 'text/plain'
-        const encoding = 'utf8'
+        const originalFilename = cuid()
 
         const { id, filename, _meta } = await this.fileAdapter.save({
             stream,
             filename: originalFilename,
-            mimetype,
-            encoding,
+            mimetype: CLOUD_STORAGE_TEXT_MIMETYPE,
+            encoding: CLOUD_STORAGE_TEXT_ENCODING,
             id: cuid(),
         })
 
         return {
             id,
             filename,
             originalFilename,
-            mimetype,
-            encoding,
+            mimetype: CLOUD_STORAGE_TEXT_MIMETYPE,
+            encoding: CLOUD_STORAGE_TEXT_ENCODING,
             _meta,
         }
     }
@@ -64,12 +59,10 @@ const CommonInterface = superclass => class extends superclass {
         return fileContent.toString()
     }
 
-    _generateFilename () {
-        return `${new Date().toISOString()}`
-    }
-
     addToTableSchema (table) {
-        table.jsonb(this.path)
+        const column = table.jsonb(this.path)
+        if (this.isNotNullable) column.notNullable()
+        if (this.defaultTo) column.defaultTo(this.defaultTo)
     }
 }
 

diff --git a/packages/keystone/fields/CloudStorageText/constants.js b/packages/keystone/fields/CloudStorageText/constants.js
@@ -0,0 +1,7 @@
+const CLOUD_STORAGE_TEXT_MIMETYPE = 'text/plain'
+const CLOUD_STORAGE_TEXT_ENCODING = 'utf8'
+
+module.exports = {
+    CLOUD_STORAGE_TEXT_MIMETYPE,
+    CLOUD_STORAGE_TEXT_ENCODING,
+}