@operato/app 1.2.46 → 1.2.48

package/package.json

@@ -2,7 +2,7 @@
   "name": "@operato/app",
   "description": "WebApplication production supporting components following open-wc recommendations",
   "author": "heartyoh",
-  "version": "1.2.46",
+  "version": "1.2.48",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {
@@ -119,16 +119,16 @@
     "@material/mwc-button": "^0.27.0",
     "@material/mwc-icon": "^0.27.0",
     "@material/mwc-icon-button": "^0.27.0",
-    "@operato/attachment": "^1.2.46",
-    "@operato/data-grist": "^1.2.39",
-    "@operato/font": "^1.2.46",
+    "@operato/attachment": "^1.2.48",
+    "@operato/data-grist": "^1.2.47",
+    "@operato/font": "^1.2.48",
     "@operato/form": "^1.2.46",
     "@operato/graphql": "^1.2.46",
     "@operato/i18n": "^1.2.35",
     "@operato/input": "^1.2.39",
-    "@operato/layout": "^1.2.46",
-    "@operato/property-editor": "^1.2.46",
-    "@operato/shell": "^1.2.46",
+    "@operato/layout": "^1.2.48",
+    "@operato/property-editor": "^1.2.48",
+    "@operato/shell": "^1.2.48",
     "@operato/styles": "^1.2.35",
     "@operato/utils": "^1.2.35",
     "codemirror": "^5.64.0",
@@ -171,5 +171,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "da9dee684fedb5601f4e813ddd75a36731ad6251"
+  "gitHead": "544b53dcf92cddc36c9b44f802fe862920a3a683"
 }

package/src/selector/ox-selector-resource-id.ts

@@ -4,7 +4,7 @@ import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 
-import { DataGrist, FetchOption, GristData, GristRecord, ZERO_DATA } from '@operato/data-grist'
+import { DataGrist, FetchOption, GristData, GristRecord, InheritedValueType, ZERO_DATA } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next } from '@operato/i18n'
 import { closePopup } from '@operato/popup'
@@ -52,6 +52,7 @@ export class OxSelectorResourceId extends LitElement {
   @property({ type: Object }) data: GristData = ZERO_DATA
   @property({ type: String }) queryName!: string
   @property({ type: Object }) basicArgs: any
+  @property({ type: String }) inherited?: InheritedValueType = 'Include'
   @property({ type: Object }) confirmCallback?: (record?: GristRecord) => void
   @property({ type: Array }) selectedRecords: GristRecord[] = []
 
@@ -163,11 +164,11 @@ export class OxSelectorResourceId extends LitElement {
     this.grist.focus()
   }
 
-  async fetchHandler({ page = 1, limit = 100, sorters = [], filters = [] }: FetchOption) {
+  async fetchHandler({ page = 1, limit = 100, sorters = [], filters = [], inherited }: FetchOption) {
     const response = await client.query({
       query: gql`
-        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          q: ${this.queryName}(filters: $filters, pagination: $pagination, sortings: $sortings) {
+        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!], $inherited) {
+          q: ${this.queryName}(filters: $filters, pagination: $pagination, sortings: $sortings, inhereted: $inherited) {
             items {
               id
               name
@@ -180,7 +181,8 @@ export class OxSelectorResourceId extends LitElement {
       variables: {
         filters,
         pagination: { page, limit },
-        sortings: sorters
+        sortings: sorters,
+        inherited: inherited || this.inherited
       }
     })
 

package/src/selector/ox-selector-resource-object-legacy.ts

@@ -13,6 +13,7 @@ import {
   GristData,
   GristEventHandler,
   GristRecord,
+  InheritedValueType,
   ZERO_DATA
 } from '@operato/data-grist'
 import { MultiColumnFormStyles, SearchForm } from '@operato/form'
@@ -60,6 +61,7 @@ export class OxSelectorResourceObjectLegacy extends LitElement {
   @property({ type: Object }) data: GristData = ZERO_DATA
   @property({ type: String }) queryName!: string
   @property({ type: Object }) basicArgs: any
+  @property({ type: String }) inherited?: InheritedValueType = 'Include'
   @property({ type: Object }) confirmCallback?: (record?: GristRecord | null) => void
   @property({ type: Array }) selectedRecords: GristRecord[] = []
 
@@ -130,15 +132,19 @@ export class OxSelectorResourceObjectLegacy extends LitElement {
     closePopup(this)
   }
 
-  fetchHandler: FetchHandler = async ({ filters, page, limit, sorters = [] }) => {
+  fetchHandler: FetchHandler = async ({ filters, page, limit, sorters = [], inherited }) => {
     const response = await client.query({
       query: gql`
-        query {
-          fetch: ${this.queryName} (${buildArgs(await this._buildConditions({ filters, page, limit, sorters }))}) {
+        query($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!], $inherited: InheritedValueType) {
+          fetch: ${
+            this.queryName
+          } (filters: $filters, pagination: $pagination, sortings: $sortings, inherited: $inherited)
+          {
             ${this.getSelectFields()}
           }
         }
       `,
+      variables: await this._buildConditions({ filters, page, limit, sorters, inherited: inherited || this.inherited }),
       context: gqlContext()
     })
 
@@ -339,7 +345,7 @@ export class OxSelectorResourceObjectLegacy extends LitElement {
     }
   }
 
-  async _buildConditions({ filters, page, limit, sorters }: FetchOption) {
+  async _buildConditions({ filters, page, limit, sorters, inherited }: FetchOption) {
     const queryConditions = {
       filters: [],
       ...this.basicArgs
@@ -348,6 +354,7 @@ export class OxSelectorResourceObjectLegacy extends LitElement {
     queryConditions.filters = [...queryConditions.filters, ...(await this.searchForm.getQueryFilters())]
     queryConditions.pagination = { page, limit }
     queryConditions.sortings = sorters
+    queryConditions.inherited = inherited
 
     return queryConditions
   }

package/src/selector/ox-selector-resource-object.ts

@@ -4,7 +4,15 @@ import gql from 'graphql-tag'
 import { css, html, LitElement, PropertyValues } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 
-import { DataGrist, FetchHandler, GristData, GristEventHandler, GristRecord, ZERO_DATA } from '@operato/data-grist'
+import {
+  DataGrist,
+  FetchHandler,
+  GristData,
+  GristEventHandler,
+  GristRecord,
+  ZERO_DATA,
+  InheritedValueType
+} from '@operato/data-grist'
 import { client, gqlContext } from '@operato/graphql'
 import { i18next } from '@operato/i18n'
 import { closePopup } from '@operato/popup'
@@ -52,6 +60,7 @@ export class OxSelectorResourceObject extends LitElement {
   @property({ type: Object }) data: GristData = ZERO_DATA
   @property({ type: String }) queryName!: string
   @property({ type: Object }) basicArgs: any
+  @property({ type: String }) inherited?: InheritedValueType = 'Include'
   @property({ type: Object }) confirmCallback?: (record?: GristRecord | null) => void
   @property({ type: Array }) selectedRecords: GristRecord[] = []
 
@@ -118,7 +127,7 @@ export class OxSelectorResourceObject extends LitElement {
     closePopup(this)
   }
 
-  fetchHandler: FetchHandler = async ({ filters = [], page, limit, sortings = [] }) => {
+  fetchHandler: FetchHandler = async ({ filters = [], page, limit, sortings = [], inherited }) => {
     if (this.basicArgs?.filters) {
       filters = adjustFilters(filters, this.basicArgs.filters)
     }
@@ -126,13 +135,20 @@ export class OxSelectorResourceObject extends LitElement {
 
     const response = await client.query({
       query: gql`
-        query($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          fetch: ${this.queryName} (filters: $filters, pagination: $pagination, sortings: $sortings) {
+        query($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!], $inherited: InheritedValueType) {
+          fetch: ${
+            this.queryName
+          } (filters: $filters, pagination: $pagination, sortings: $sortings, inherited: $inherited) {
             ${this.getQueryFields()}
           }
         }
       `,
-      variables: { filters, pagination, sortings },
+      variables: {
+        filters,
+        pagination,
+        sortings,
+        inherited: inherited || this.inherited
+      },
       context: gqlContext()
     })