@operato/data-grist 8.0.0-alpha.0 → 8.0.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/data-grist",
-  "version": "8.0.0-alpha.0",
+  "version": "8.0.0-alpha.10",
   "description": "User interface for grid (desktop) and list (mobile)",
   "author": "heartyoh",
   "main": "dist/index.js",
@@ -63,12 +63,12 @@
   "dependencies": {
     "@material/web": "^2.0.0",
     "@operato/headroom": "^8.0.0-alpha.0",
-    "@operato/input": "^8.0.0-alpha.0",
-    "@operato/p13n": "^8.0.0-alpha.0",
-    "@operato/popup": "^8.0.0-alpha.0",
+    "@operato/input": "^8.0.0-alpha.10",
+    "@operato/p13n": "^8.0.0-alpha.4",
+    "@operato/popup": "^8.0.0-alpha.4",
     "@operato/pull-to-refresh": "^8.0.0-alpha.0",
-    "@operato/styles": "^8.0.0-alpha.0",
-    "@operato/time-calculator": "^8.0.0-alpha.0",
+    "@operato/styles": "^8.0.0-alpha.4",
+    "@operato/time-calculator": "^8.0.0-alpha.6",
     "@operato/utils": "^8.0.0-alpha.0",
     "i18next": "^23.11.5",
     "json5": "^2.2.0",
@@ -108,5 +108,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "094233a9ce34f6922283581c088d5c4395ba54d0"
+  "gitHead": "f937b76c9831c46e26acde8e94cc71514068a961"
 }

package/src/data-card/record-card.ts

@@ -25,7 +25,16 @@ const OPTIONS: Intl.DateTimeFormatOptions = {
   // timeZone: 'America/Los_Angeles'
 }
 
-const formatter = new Intl.DateTimeFormat(navigator.language, OPTIONS)
+function getSafeFormatter(locale: string, options: Intl.DateTimeFormatOptions) {
+  try {
+    const safeLocale = locale || 'en-US'
+    return new Intl.DateTimeFormat(safeLocale, options)
+  } catch (e) {
+    return new Intl.DateTimeFormat('en-US', options)
+  }
+}
+
+const formatter = getSafeFormatter(navigator.language, OPTIONS)
 
 @customElement('ox-record-card')
 export class RecordCard extends LitElement {

package/src/data-grist.ts

@@ -31,7 +31,8 @@ import {
   GristSelectFunction,
   PaginationConfig,
   PersonalGristPreference,
-  SortersConfig
+  SortersConfig,
+  ValidationReason
 } from './types'
 import { convertListParamToSearchString, convertSearchStringToListParam } from './utils'
 
@@ -478,28 +479,28 @@ export class DataGrist extends LitElement implements DataConsumer {
               </ox-grid>
             `
           : this.mode == 'CARD'
-            ? html`
-                <ox-card
-                  id="grist"
-                  .config=${this.compiledConfig}
-                  .data=${this._data}
-                  .sorters=${this.sorters || []}
-                  .filters=${this.filters || []}
-                  ?empty=${empty}
-                >
-                </ox-card>
-              `
-            : html`
-                <ox-list
-                  id="grist"
-                  .config=${this.compiledConfig}
-                  .data=${this._data}
-                  .sorters=${this.sorters || []}
-                  .filters=${this.filters || []}
-                  ?empty=${empty}
-                >
-                </ox-list>
-              `}
+          ? html`
+              <ox-card
+                id="grist"
+                .config=${this.compiledConfig}
+                .data=${this._data}
+                .sorters=${this.sorters || []}
+                .filters=${this.filters || []}
+                ?empty=${empty}
+              >
+              </ox-card>
+            `
+          : html`
+              <ox-list
+                id="grist"
+                .config=${this.compiledConfig}
+                .data=${this._data}
+                .sorters=${this.sorters || []}
+                .filters=${this.filters || []}
+                ?empty=${empty}
+              >
+              </ox-list>
+            `}
       </div>
 
       <div id="spinner" ?show=${this._showSpinner}></div>
@@ -1190,8 +1191,43 @@ export class DataGrist extends LitElement implements DataConsumer {
       })
     )
   }
-
+  /**
+   * Returns the current pagination limit.
+   * @returns {number} The current pagination limit value
+   */
   getCurrentLimit() {
     return this.dataProvider?.limit || ZERO_PAGINATION.limit
   }
+
+  /**
+   * Checks the validity of dirty records.
+   * @returns {Array<{record: GristRecord, invalidFields: Array<{field: string, reason: ValidationReason}>}>} List of invalid records and their corresponding invalid fields
+   */
+  checkDirtyRecordsValidity(): { record: GristRecord; invalidFields: { field: string; reason: ValidationReason }[] }[] {
+    const records = this.dirtyRecords
+    const validationResults = []
+
+    for (const record of records) {
+      const invalidFields = []
+
+      for (const column of this.compiledConfig.columns) {
+        if (column.record?.mandatory && (record[column.name] === undefined || record[column.name] === null)) {
+          invalidFields.push({
+            field: column.name,
+            reason: ValidationReason.MANDATORY
+          })
+        }
+        // Additional validation rules can be implemented here.
+      }
+
+      if (invalidFields.length > 0) {
+        validationResults.push({
+          record,
+          invalidFields
+        })
+      }
+    }
+
+    return validationResults
+  }
 }

package/src/data-list/record-partial.ts

@@ -26,7 +26,16 @@ const OPTIONS: Intl.DateTimeFormatOptions = {
   // timeZone: 'America/Los_Angeles'
 }
 
-const formatter = new Intl.DateTimeFormat(navigator.language, OPTIONS)
+function getSafeFormatter(locale: string, options: Intl.DateTimeFormatOptions) {
+  try {
+    const safeLocale = locale || 'en-US'
+    return new Intl.DateTimeFormat(safeLocale, options)
+  } catch (e) {
+    return new Intl.DateTimeFormat('en-US', options)
+  }
+}
+
+const formatter = getSafeFormatter(navigator.language, OPTIONS)
 
 @customElement('ox-record-partial')
 export class RecordPartial extends LitElement {

package/src/editors/ox-grist-editor-file.ts

@@ -21,6 +21,8 @@ export class OxGristEditorFile extends OxGristEditor {
 
   get editorTemplate() {
     var value = typeof this.value === 'string' ? null : this.value
-    return html` <input style="opacity: 1" type="file" /> `
+    var { multiple = false } = this.column.record || {}
+
+    return html` <input style="opacity: 1" type="file" ?multiple=${multiple} /> `
   }
 }

package/src/record-view/record-creator.ts

@@ -7,7 +7,7 @@ import { customElement, property, state } from 'lit/decorators.js'
 import { OxPopup } from '@operato/popup'
 
 import { DataGrist } from '../data-grist'
-import { ColumnConfig, GristRecord } from '../types'
+import { ColumnConfig, GristRecord, ValidationReason } from '../types'
 import { RecordView } from './record-view'
 
 @customElement('ox-record-creator')
@@ -43,6 +43,23 @@ export class RecordCreator extends LitElement {
     return html`<slot></slot>`
   }
 
+  validateRecord(record: GristRecord): { field: string; reason: ValidationReason }[] {
+    const columns = this.grist!.compiledConfig.columns;
+    const invalidFields: { field: string; reason: ValidationReason }[] = [];
+
+    columns.forEach(column => {
+      if (column.record?.mandatory && (record[column.name] === undefined || record[column.name] === null || record[column.name] === '')) {
+        invalidFields.push({
+          field: column.name,
+          reason: ValidationReason.MANDATORY
+        });
+      }
+      // 여기에 추가적인 유효성 검사 규칙을 구현할 수 있습니다.
+    });
+
+    return invalidFields
+  }
+
   lightPopupRecordView() {
     const config = this.grist!.compiledConfig
     var title = 'create'
@@ -87,10 +104,21 @@ export class RecordCreator extends LitElement {
           @cancel=${(e: Event) => {
             popup.close()
           }}
-          @ok=${(e: Event) => {
-            popup.close()
+          @ok=${async (e: Event) => {
+              const view = e.currentTarget as RecordView
 
-            const view = e.currentTarget as RecordView
+            // 레코드 밸리데이션 체크
+            const invalidFields = await this.validateRecord(view.record);
+            if (invalidFields.length > 0) {
+              // const firstInvalidField = invalidFields[0];
+              // if (firstInvalidField) {
+              //   view.setFocus(firstInvalidField.field)
+              // }
+              view.setFocusOnInvalid(invalidFields);
+              return false;
+            }
+
+            popup.close()
 
             this.dispatchEvent(
               new CustomEvent('ok', {
@@ -142,8 +170,26 @@ export class RecordCreator extends LitElement {
 
             recordView.addEventListener('ok', async (e: Event) => {
               const view = e.currentTarget as RecordView
+
+              // 레코드 밸리데이션 체크
+              const invalidFields = await this.validateRecord(view.record);
+              if (invalidFields.length > 0) {
+                const firstInvalidField = invalidFields[0];
+                if (firstInvalidField) {
+                  const fieldElement = view.renderRoot?.querySelector(`[name="${firstInvalidField}"]`);
+                  if (fieldElement) {
+                    (fieldElement as HTMLElement).focus();
+                  }
+                }
+                return false;
+              }
+              
               if (await this.callback?.(view.record)) {
                 popup.close()
+              } else {
+                // 밸리데이션 실패 시 처리
+                console.error('레코드 밸리데이션 실패');
+                // 여기에 사용자에게 오류 메시지를 표시하는 로직을 추가할 수 있습니다.
               }
             })
 

package/src/record-view/record-view-body.ts

@@ -5,8 +5,9 @@ import { css, html, LitElement } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 
 import { ZERO_RECORD } from '../configure/zero-config'
-import { ColumnConfig, GristRecord } from '../types'
+import { ColumnConfig, GristRecord, ValidationReason } from '../types'
 import { recordViewBodyClickHandler } from './event-handlers/record-view-body-click-handler'
+import i18next from 'i18next'
 
 @customElement('ox-record-view-body')
 export class RecordViewBody extends LitElement {
@@ -14,10 +15,17 @@ export class RecordViewBody extends LitElement {
     css`
       :host {
         display: flex;
-        justify-content: center;
+        flex-direction: column;
+        align-content: center;
+      }
+
+      :host > * {
+        align-self: stretch;
       }
 
       div[content] {
+        align-self: center;
+
         display: grid;
         grid-template-columns: 2fr 3fr 2fr 3fr;
         grid-auto-rows: min-content;
@@ -26,6 +34,7 @@ export class RecordViewBody extends LitElement {
         padding: var(--spacing-large) var(--spacing-huge);
         font-size: 16px; /* for ios safari */
         flex: 1;
+        width: 100%;
         max-width: 1300px;
         box-sizing: border-box;
       }
@@ -61,7 +70,6 @@ export class RecordViewBody extends LitElement {
       }
 
       ox-grid-field {
-        justify-content: var();
         background-color: var(--record-view-grid-field-background-color, var(--md-sys-color-surface-container-lowest));
         border: var(--record-view-grid-field-border);
         border-radius: var(--md-sys-shape-corner-small);
@@ -88,6 +96,20 @@ export class RecordViewBody extends LitElement {
         font-weight: bold;
       }
 
+      .highlight-invalid {
+        position: relative;
+        padding: var(--spacing-tiny) var(--spacing-small);
+      }
+
+      .highlight-invalid::after {
+        content: attr(data-reason); /* 콘텐츠를 동적으로 변경하기 위해 data-reason 속성을 사용 */
+        color: red;
+        font-size: 12px;
+        position: absolute;
+        left: 0;
+        bottom: -8px; /* 라벨 아래쪽에 메시지를 표시 */
+      }
+
       @media only screen and (max-width: 1000px) {
         div[content] {
           grid-template-columns: 2fr 3fr;
@@ -144,6 +166,35 @@ export class RecordViewBody extends LitElement {
     this.removeEventListener('keydown', this._onKeyDown)
   }
 
+  setFocus(fieldElement: HTMLElement) {
+    fieldElement?.dispatchEvent(new CustomEvent('click', { bubbles: true, composed: true }))
+  }
+
+  setFocusOnInvalid(invalidFields: { field: string; reason: ValidationReason }[]) {
+    const allLabels = this.renderRoot.querySelectorAll('label')
+    allLabels.forEach((label: HTMLLabelElement) => {
+      label.classList.remove('highlight-invalid')
+      label.removeAttribute('data-reason')
+    })
+
+    // 유효성 검사를 통과하지 못한 필드에 대해 처리
+    invalidFields.forEach(({ field, reason }, index) => {
+      const labelElement = this.renderRoot.querySelector(`[data-name="${field}"]`) as HTMLLabelElement
+      const fieldElement = this.renderRoot.querySelector(`[data-name="${field}"] + ox-grid-field`) as HTMLInputElement
+
+      // 동적으로 data-reason 속성을 설정하여 메시지를 변경
+      if (labelElement) {
+        labelElement.classList.add('highlight-invalid')
+        labelElement.setAttribute('data-reason', '(' + i18next.t(`text.validation-reason.${reason}`) + ')')
+      }
+
+      // 첫 번째 필드에 포커스 설정
+      if (index === 0 && fieldElement) {
+        this.setFocus(fieldElement)
+      }
+    })
+  }
+
   _onKeyDown(event: KeyboardEvent) {
     if (event.key === 'Tab') {
       const fields = Array.from(this.renderRoot.querySelectorAll('ox-grid-field[tabstop]'))
@@ -157,7 +208,8 @@ export class RecordViewBody extends LitElement {
       }
 
       event.preventDefault()
-      fields[nextIndex]?.dispatchEvent(new CustomEvent('click', { bubbles: true, composed: true }))
+      const nextField = fields[nextIndex] as HTMLInputElement
+      nextField && this.setFocus(nextField)
     }
   }
 
@@ -177,7 +229,7 @@ export class RecordViewBody extends LitElement {
           let dirtyFields = record['__dirtyfields__'] || {}
 
           return html`
-            <label ?editable=${editable} ?wide=${wide}>
+            <label ?editable=${editable} ?wide=${wide} data-name=${column.name}>
               <span>${mandatory ? '*' : ''}${this._renderLabel(column)}</span>
               <md-icon>edit</md-icon>
             </label>

package/src/record-view/record-view.ts

@@ -4,12 +4,14 @@ import '@operato/input/ox-input-file.js'
 import '../data-grid/data-grid-field'
 
 import { css, html, LitElement } from 'lit'
-import { customElement, property } from 'lit/decorators.js'
+import { customElement, property, query } from 'lit/decorators.js'
 
 import { ScrollbarStyles } from '@operato/styles'
 
 import { ZERO_RECORD } from '../configure/zero-config'
-import { ColumnConfig, GristRecord } from '../types'
+import { ColumnConfig, GristRecord, ValidationReason } from '../types'
+
+import { RecordViewBody } from './record-view-body'
 
 @customElement('ox-record-view')
 export class RecordView extends LitElement {
@@ -66,6 +68,8 @@ export class RecordView extends LitElement {
   @property({ type: Object }) record: GristRecord = ZERO_RECORD
   @property({ type: Number }) rowIndex: number = -1
 
+  @query('ox-record-view-body') body!: RecordViewBody
+
   render() {
     return html`
       <ox-record-view-body .columns=${this.columns} .record=${this.record} .rowIndex=${this.rowIndex}>
@@ -82,6 +86,10 @@ export class RecordView extends LitElement {
     this.setAttribute('tabindex', '0')
   }
 
+  setFocusOnInvalid(invalidFields: { field: string; reason: ValidationReason }[]) {
+    this.body.setFocusOnInvalid(invalidFields)
+  }
+
   onReset() {
     this.focus()
 

package/src/renderers/ox-grist-renderer-file.ts

@@ -1,17 +1,31 @@
-import { html } from 'lit'
+import { html, nothing } from 'lit'
 
 import { FieldRenderer } from '../types'
 
+function download(file: { mimetype: string; name: string; fullpath: string }) {
+  const element = document.createElement('a')
+  element.setAttribute('href', file.fullpath)
+  element.setAttribute('download', file.name!)
+  document.body.appendChild(element)
+  element.click()
+}
+
 export const OxGristRendererFile: FieldRenderer = (value, column, record, rowIndex, field) => {
   let text: string
 
   if (!value) {
-    text = ''
+    return html`<span>&nbsp;</span>`
   } else if (typeof value === 'string') {
-    text = value
+    return html`<span>${value}</span>`
   } else {
-    text = value[0].name
+    const files = value as { mimetype: string; name: string; fullpath: string }[]
+    return html`<span
+      >${files.map(
+        (file, idx) => html`
+          <a @click=${() => download(file)} file><md-icon>description</md-icon>${file.name}</a>
+          ${files.length - 1 == idx ? html`</br>` : nothing}
+        `
+      )}</span
+    >`
   }
-
-  return html`<span>${text}</span>`
 }

package/src/types.ts

@@ -803,3 +803,11 @@ export type FilterPreference = {
   hidden?: boolean
   value?: any
 }
+
+export enum ValidationReason {
+  MANDATORY = 'MANDATORY',
+  FORMAT = 'FORMAT',
+  RANGE = 'RANGE',
+  UNIQUE = 'UNIQUE'
+}
+

package/translations/en.json

@@ -6,5 +6,9 @@
   "label.accumulator_avg": "avg",
   "label.accumulator_count": "cnt",
   "label.accumulator_max": "min",
-  "label.accumulator_min": "max"
+  "label.accumulator_min": "max",
+  "text.validation-reason.MANDATORY": "mandatory",
+  "text.validation-reason.FORMAT": "invalid format",
+  "text.validation-reason.RANGE": "out of range",
+  "text.validation-reason.UNIQUE": "duplicate value"
 }

package/translations/ja.json

@@ -5,5 +5,9 @@
   "label.accumulator_avg": "平均",
   "label.accumulator_count": "カウント",
   "label.accumulator_max": "最小",
-  "label.accumulator_min": "最大"
+  "label.accumulator_min": "最大",
+  "text.validation-reason.MANDATORY": "必須",
+  "text.validation-reason.FORMAT": "形式が正しくありません",
+  "text.validation-reason.RANGE": "範囲外",
+  "text.validation-reason.UNIQUE": "重複"
 }

package/translations/ko.json

@@ -5,5 +5,9 @@
   "label.accumulator_avg": "평균",
   "label.accumulator_count": "계수",
   "label.accumulator_max": "최소",
-  "label.accumulator_min": "최대"
+  "label.accumulator_min": "최대",
+  "text.validation-reason.MANDATORY": "필수 입력 항목입니다.",
+  "text.validation-reason.FORMAT": "잘못된 형식입니다.",
+  "text.validation-reason.RANGE": "범위를 벗어났습니다.",
+  "text.validation-reason.UNIQUE": "중복된 값입니다."
 }

package/translations/ms.json

@@ -5,5 +5,9 @@
   "label.accumulator_avg": "Purata",
   "label.accumulator_count": "Kiraan",
   "label.accumulator_max": "Minimum",
-  "label.accumulator_min": "Maksimum"
+  "label.accumulator_min": "Maksimum",
+  "text.validation-reason.MANDATORY": "wajib",
+  "text.validation-reason.FORMAT": "format tidak sah",
+  "text.validation-reason.RANGE": "diluar jangka",
+  "text.validation-reason.UNIQUE": "nilai duplikat"
 }

package/translations/zh.json

@@ -5,5 +5,9 @@
   "label.accumulator_avg": "平均",
   "label.accumulator_count": "计数",
   "label.accumulator_max": "最小",
-  "label.accumulator_min": "最大"
+  "label.accumulator_min": "最大",
+  "text.validation-reason.MANDATORY": "必填",
+  "text.validation-reason.FORMAT": "格式不正确",
+  "text.validation-reason.RANGE": "超出范围",
+  "text.validation-reason.UNIQUE": "重复值"
 }

package/dist/stories/default-filters.stories copy.d.ts

@@ -1,26 +0,0 @@
-import '../src/index.js';
-import '../src/filters/filters-form.js';
-import '../src/sorters/sorters-control.js';
-import '@operato/popup/ox-popup-list.js';
-import '@material/web/icon/icon.js';
-import { TemplateResult } from 'lit';
-declare const _default: {
-    title: string;
-    component: string;
-    argTypes: {
-        headerFilter: {
-            control: string;
-        };
-    };
-};
-export default _default;
-interface Story<T> {
-    (args: T): TemplateResult;
-    args?: Partial<T>;
-    argTypes?: Record<string, unknown>;
-}
-interface ArgTypes {
-    headerFilter: boolean;
-    theme?: 'light' | 'dark';
-}
-export declare const Regular: Story<ArgTypes>;