@operato/app 1.0.0-alpha.30 → 1.0.0-alpha.33

package/package.json

@@ -3,7 +3,7 @@
   "description": "WebApplication production supporting components following open-wc recommendations",
   "license": "MIT",
   "author": "heartyoh",
-  "version": "1.0.0-alpha.30",
+  "version": "1.0.0-alpha.33",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {
@@ -17,8 +17,9 @@
     "./grist-editor.js": "./dist/src/grist-editor/index.js",
     "./grist-editor/ox-grist-editor-resource-id.js": "./dist/src/grist-editor/ox-grist-editor-resource-id.js",
     "./grist-editor/ox-selector-resource-id.js": "./dist/src/grist-editor/ox-selector-resource-id.js",
-    "./grist-editor/ox-renderer-resource-id.js": "./dist/src/grist-editor/ox-renderer-resource-id.js",
+    "./grist-editor/ox-grist-renderer-resource-id.js": "./dist/src/grist-editor/ox-grist-renderer-resource-id.js",
     "./grist-editor/ox-selector-resource-object.js": "./dist/src/grist-editor/ox-selector-resource-object.js",
+    "./grist-editor/ox-grist-renderer-resource-object.js": "./dist/src/grist-editor/ox-grist-renderer-resource-object.js",
     "./grist-editor/ox-grist-editor-crontab.js": "./dist/src/grist-editor/ox-grist-editor-crontab.js",
     "./grist-editor/ox-grist-editor-json.js": "./dist/src/grist-editor/ox-grist-editor-json.js",
     "./grist-editor/ox-grist-editor-code.js": "./dist/src/grist-editor/ox-grist-editor-code.js",
@@ -56,18 +57,18 @@
     "@material/mwc-button": "^0.25.3",
     "@material/mwc-icon": "^0.25.3",
     "@material/mwc-icon-button": "^0.25.3",
-    "@operato/attachment": "^1.0.0-alpha.30",
-    "@operato/data-grist": "^1.0.0-alpha.30",
-    "@operato/font": "^1.0.0-alpha.30",
-    "@operato/form": "^1.0.0-alpha.30",
-    "@operato/graphql": "^1.0.0-alpha.30",
-    "@operato/i18n": "^1.0.0-alpha.30",
-    "@operato/input": "^1.0.0-alpha.30",
-    "@operato/layout": "^1.0.0-alpha.30",
-    "@operato/property-editor": "^1.0.0-alpha.30",
-    "@operato/shell": "^1.0.0-alpha.30",
-    "@operato/styles": "^1.0.0-alpha.30",
-    "@operato/utils": "^1.0.0-alpha.30",
+    "@operato/attachment": "^1.0.0-alpha.33",
+    "@operato/data-grist": "^1.0.0-alpha.33",
+    "@operato/font": "^1.0.0-alpha.33",
+    "@operato/form": "^1.0.0-alpha.33",
+    "@operato/graphql": "^1.0.0-alpha.33",
+    "@operato/i18n": "^1.0.0-alpha.33",
+    "@operato/input": "^1.0.0-alpha.33",
+    "@operato/layout": "^1.0.0-alpha.33",
+    "@operato/property-editor": "^1.0.0-alpha.33",
+    "@operato/shell": "^1.0.0-alpha.33",
+    "@operato/styles": "^1.0.0-alpha.33",
+    "@operato/utils": "^1.0.0-alpha.33",
     "codemirror": "^5.59.1",
     "codemirror-graphql": "^0.15.2",
     "cross-fetch": "^3.1.5",
@@ -107,5 +108,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "1c34587861ba435ec33a5eba542c88608f8ea6d3"
+  "gitHead": "0a92fdc92e904a69ed5f6dfbfb0f383c4d54f102"
 }

package/src/grist-editor/index.ts

@@ -1,4 +1,4 @@
-import { Json5Renderer, registerEditor, registerRenderer } from '@operato/data-grist'
+import { OxGristRendererJson5, registerEditor, registerRenderer } from '@operato/data-grist'
 
 import { OxGristEditorCrontab } from './ox-grist-editor-crontab.js'
 import { OxGristEditorJson } from './ox-grist-editor-json.js'
@@ -9,6 +9,7 @@ import { OxGristEditorResourceId } from './ox-grist-editor-resource-id.js'
 import { OxGristEditorResourceObject } from './ox-grist-editor-resource-object.js'
 import { OxGristEditorValueMap } from './ox-grist-editor-value-map.js'
 import { OxGristRendererResourceId } from './ox-grist-renderer-resource-id.js'
+import { OxGristRendererResourceObject } from './ox-grist-renderer-resource-object.js'
 
 /* register grist renderer/editor for id */
 registerEditor('resource-id', OxGristEditorResourceId)
@@ -21,6 +22,7 @@ registerEditor('crontab', OxGristEditorCrontab)
 registerEditor('json', OxGristEditorJson)
 
 registerRenderer('resource-id', OxGristRendererResourceId)
-registerRenderer('parameters', Json5Renderer)
-registerRenderer('value-map', Json5Renderer)
-registerRenderer('partition-keys', Json5Renderer)
+registerRenderer('resource-object', OxGristRendererResourceObject)
+registerRenderer('parameters', OxGristRendererJson5)
+registerRenderer('value-map', OxGristRendererJson5)
+registerRenderer('partition-keys', OxGristRendererJson5)

package/src/grist-editor/ox-grist-editor-code.ts

@@ -1,13 +1,13 @@
 import './ox-popup-code-input.js'
 
-import { InputEditor } from '@operato/data-grist'
+import { OxGristEditor } from '@operato/data-grist'
 import { customElement } from 'lit/decorators.js'
 import { html } from 'lit'
 import { i18next } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
 
 @customElement('ox-grist-editor-code')
-export class OxGristEditorCode extends InputEditor {
+export class OxGristEditorCode extends OxGristEditor {
   get editorTemplate() {
     return html` <input type="text" .value=${this.value || ''} /> `
   }

package/src/grist-editor/ox-grist-editor-crontab.ts

@@ -2,13 +2,13 @@ import './ox-popup-crontab-input.js'
 
 import { PopupHandle, openPopup } from '@operato/layout'
 
-import { InputEditor } from '@operato/data-grist'
+import { OxGristEditor } from '@operato/data-grist'
 import { customElement } from 'lit/decorators.js'
 import { html } from 'lit'
 import { i18next } from '@operato/i18n'
 
 @customElement('ox-grist-editor-crontab')
-export class OxGristEditorCrontab extends InputEditor {
+export class OxGristEditorCrontab extends OxGristEditor {
   private popup?: PopupHandle
 
   get editorTemplate() {

package/src/grist-editor/ox-grist-editor-json.ts

@@ -1,13 +1,13 @@
 import './ox-popup-code-input.js'
 
-import { InputEditor } from '@operato/data-grist'
+import { OxGristEditor } from '@operato/data-grist'
 import { customElement } from 'lit/decorators.js'
 import { html } from 'lit'
 import { i18next } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
 
 @customElement('ox-grist-editor-json')
-export class OxGristEditorJson extends InputEditor {
+export class OxGristEditorJson extends OxGristEditor {
   get editorTemplate() {
     return html` <input type="text" .value=${this.value || ''} /> `
   }

package/src/grist-editor/ox-grist-editor-parameters.ts

@@ -5,7 +5,7 @@
 import './ox-parameters-builder.js'
 import './ox-popup-parameters-builder.js'
 
-import { ColumnConfig, GristRecord, InputEditor } from '@operato/data-grist'
+import { ColumnConfig, GristRecord, OxGristEditor } from '@operato/data-grist'
 import { PopupHandle, openPopup } from '@operato/layout'
 import { css, html } from 'lit'
 
@@ -14,7 +14,7 @@ import { customElement } from 'lit/decorators.js'
 import { i18next } from '@operato/i18n'
 
 @customElement('ox-grist-editor-parameters')
-export class OxGristEditorParameters extends InputEditor {
+export class OxGristEditorParameters extends OxGristEditor {
   private popup?: PopupHandle
 
   get editorTemplate() {

package/src/grist-editor/ox-grist-editor-partition-keys.ts

@@ -7,13 +7,13 @@ import './ox-popup-partition-keys-input.js'
 import { PopupHandle, openPopup } from '@operato/layout'
 import { customElement, property } from 'lit/decorators.js'
 
-import { InputEditor } from '@operato/data-grist'
+import { OxGristEditor } from '@operato/data-grist'
 import { cloneDeep } from 'lodash-es'
 import { html } from 'lit'
 import { i18next } from '@operato/i18n'
 
 @customElement('ox-grist-editor-partition-keys')
-export class OxGristEditorPartitionKeys extends InputEditor {
+export class OxGristEditorPartitionKeys extends OxGristEditor {
   private popup?: PopupHandle
 
   get editorTemplate() {

package/src/grist-editor/ox-grist-editor-resource-code.ts

@@ -1,6 +1,6 @@
 import '@material/mwc-icon'
 
-import { InputEditor, RecordConfig } from '@operato/data-grist'
+import { OxGristEditor, RecordConfig } from '@operato/data-grist'
 import { client, gqlContext } from '@operato/graphql'
 
 import { customElement } from 'lit/decorators.js'
@@ -32,7 +32,7 @@ const FETCH_COMMON_CODE_GQL = (codeName: string) => gql`
 `
 
 @customElement('ox-grist-editor-resource-code')
-export class OxGristEditorResourceCode extends InputEditor {
+export class OxGristEditorResourceCode extends OxGristEditor {
   async firstUpdated() {
     super.firstUpdated()
 

package/src/grist-editor/ox-grist-editor-resource-id.ts

@@ -1,14 +1,14 @@
 import '@material/mwc-icon'
 import './ox-selector-resource-id.js'
 
-import { GristRecord, InputEditor } from '@operato/data-grist'
+import { GristRecord, OxGristEditor } from '@operato/data-grist'
 import { PopupHandle, openPopup } from '@operato/layout'
 import { TemplateResult, html } from 'lit'
 
 import { customElement } from 'lit/decorators.js'
 
 @customElement('ox-input-resource-id')
-export class OxGristEditorResourceId extends InputEditor {
+export class OxGristEditorResourceId extends OxGristEditor {
   private popup?: PopupHandle
 
   render() {

package/src/grist-editor/ox-grist-editor-resource-object.ts

@@ -4,12 +4,12 @@ import './ox-selector-resource-object.js'
 import { PopupHandle, openPopup } from '@operato/layout'
 import { TemplateResult, css, html } from 'lit'
 
-import { InputEditor } from '@operato/data-grist'
+import { OxGristEditor } from '@operato/data-grist'
 import { customElement } from 'lit/decorators.js'
 import { i18next } from '@operato/i18n'
 
 @customElement('ox-grist-editor-resource-object')
-export class OxGristEditorResourceObject extends InputEditor {
+export class OxGristEditorResourceObject extends OxGristEditor {
   private popup?: PopupHandle
   private template?: TemplateResult
 

package/src/grist-editor/ox-grist-editor-value-map.ts

@@ -4,7 +4,7 @@
 
 import './ox-popup-value-map-input.js'
 
-import { ColumnConfig, GristRecord, InputEditor } from '@operato/data-grist'
+import { ColumnConfig, GristRecord, OxGristEditor } from '@operato/data-grist'
 import { PopupHandle, openPopup } from '@operato/layout'
 import { css, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
@@ -13,7 +13,7 @@ import { cloneDeep } from 'lodash-es'
 import { i18next } from '@operato/i18n'
 
 @customElement('ox-grist-editor-value-map')
-export class OxGristEditorValueMap extends InputEditor {
+export class OxGristEditorValueMap extends OxGristEditor {
   private popup?: PopupHandle
 
   get editorTemplate() {

package/src/grist-editor/ox-grist-renderer-resource-object.ts

@@ -0,0 +1,25 @@
+import { FieldRenderer } from '@operato/data-grist'
+import { html } from 'lit-html'
+
+export const OxGristRendererResourceObject: FieldRenderer = (value, column, record, rowIndex, field) => {
+  if (!value) {
+    return ''
+  }
+
+  var { nameField = 'name', descriptionField = 'description' } = column.record.options || {}
+  var name, description
+
+  if (typeof nameField === 'function') {
+    name = nameField(value)
+  } else {
+    name = value[nameField]
+  }
+
+  if (typeof descriptionField === 'function') {
+    description = descriptionField(value)
+  } else {
+    description = value[descriptionField] && `(${value[descriptionField]})`
+  }
+
+  return html` ${name || ''}${description || ''} `
+}

package/src/grist-editor/ox-popup-partition-keys-input.ts

@@ -73,7 +73,7 @@ export class OxPopupPartitionKeysInput extends LitElement {
       이런 이유로, Object.assign(...)을 사용하였다.
     */
 
-    if (!this.value) {
+    if (!this.value || typeof this.value !== 'object') {
       this.value = {}
     }