@things-factory/resource-ui 7.0.1-alpha.26 → 7.0.1-alpha.27

package/client/elements/object-selector.js

@@ -1,10 +1,14 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@operato/data-grist'
-import { i18next } from '@things-factory/i18n-base'
+
+import { css, html, LitElement } from 'lit'
+import gql from 'graphql-tag'
+
+import { i18next } from '@operato/i18n-base'
+import { MultiColumnFormStyles } from '@operato/form'
+import { ButtonContainerStyles } from '@operato/styles'
+
 import { client, gqlContext } from '@things-factory/shell'
 import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
 
 export class ObjectSelector extends LitElement {
   static get properties() {
@@ -25,6 +29,7 @@ export class ObjectSelector extends LitElement {
 
   static get styles() {
     return [
+      ButtonContainerStyles,
       MultiColumnFormStyles,
       css`
         :host {
@@ -38,11 +43,6 @@ export class ObjectSelector extends LitElement {
           flex: 1;
         }
 
-        .button-container {
-          display: flex;
-          margin-left: auto;
-        }
-
         form {
           position: relative;
         }
@@ -77,8 +77,8 @@ export class ObjectSelector extends LitElement {
       ></ox-grist>
 
       <div class="button-container">
-        <mwc-button @click=${this.oncancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>
-        <mwc-button @click=${this.onconfirm.bind(this)}>${i18next.t('button.confirm')}</mwc-button>
+        <button @click=${this.oncancel.bind(this)}><md-icon>cancel</md-icon>${i18next.t('button.cancel')}</button>
+        <button @click=${this.onconfirm.bind(this)}><md-icon>check</md-icon>${i18next.t('button.confirm')}</button>
       </div>
     `
   }
@@ -179,21 +179,9 @@ export class ObjectSelector extends LitElement {
         return {
           label: selectField.header || i18next.t(`field.${selectField.name}`),
           name: selectField.name,
-          type:
-            fieldType === 'string'
-              ? 'text'
-              : numberTypes.indexOf(fieldType) >= 0
-              ? 'number'
-              : fieldType === 'boolean'
-              ? 'checkbox'
-              : fieldType,
+          type: fieldType === 'string' ? 'text' : numberTypes.indexOf(fieldType) >= 0 ? 'number' : fieldType === 'boolean' ? 'checkbox' : fieldType,
           queryName: selectField.queryName,
-          props:
-            fieldType === 'string'
-              ? { searchOper: 'i_like' }
-              : fieldType === 'object'
-              ? { searchOper: 'in' }
-              : { searchOper: 'eq' },
+          props: fieldType === 'string' ? { searchOper: 'i_like' } : fieldType === 'object' ? { searchOper: 'in' } : { searchOper: 'eq' },
           attrs: fieldType === 'boolean' ? ['indeterminated'] : []
         }
       })
@@ -284,11 +272,7 @@ export class ObjectSelector extends LitElement {
       return `items {
         ${this.select.map(selectField => {
           return selectField.type === 'object'
-            ? `${selectField.name} { ${
-                selectField.subFields && selectField.subFields.length > 0
-                  ? selectField.subFields.join(' ')
-                  : `id name description`
-              } }`
+            ? `${selectField.name} { ${selectField.subFields && selectField.subFields.length > 0 ? selectField.subFields.join(' ') : `id name description`} }`
             : `${selectField.name}`
         })}
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/resource-ui",
-  "version": "7.0.1-alpha.26",
+  "version": "7.0.1-alpha.27",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,7 +27,7 @@
     "@operato/app": "^2.0.0-alpha.0",
     "@operato/data-grist": "^2.0.0-alpha.0",
     "@operato/layout": "^2.0.0-alpha.0",
-    "@things-factory/auth-ui": "^7.0.1-alpha.26",
+    "@things-factory/auth-ui": "^7.0.1-alpha.27",
     "@things-factory/context-ui": "^7.0.1-alpha.26",
     "@things-factory/form-ui": "^7.0.1-alpha.26",
     "@things-factory/i18n-base": "^7.0.1-alpha.26",
@@ -35,5 +35,5 @@
     "@things-factory/menu-base": "^7.0.1-alpha.26",
     "@things-factory/resource-base": "^7.0.1-alpha.26"
   },
-  "gitHead": "664e741d90e09b8b0e26763eb1eb03fd3f75b6d7"
+  "gitHead": "ce732afe6518f62850fc0b3499fd062e7a1eea1d"
 }