@operato/board 1.2.49 → 1.2.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/board",
-  "version": "1.2.49",
+  "version": "1.2.51",
   "description": "Webcomponent for board following open-wc recommendations",
   "author": "heartyoh",
   "main": "dist/src/index.js",
@@ -88,16 +88,16 @@
   },
   "dependencies": {
     "@open-wc/scoped-elements": "^2.0.0-next.6",
-    "@operato/app": "^1.2.49",
-    "@operato/data-grist": "^1.2.47",
-    "@operato/font": "^1.2.49",
+    "@operato/app": "^1.2.50",
+    "@operato/data-grist": "^1.2.50",
+    "@operato/font": "^1.2.50",
     "@operato/graphql": "^1.2.46",
     "@operato/i18n": "^1.2.35",
     "@operato/input": "^1.2.39",
     "@operato/layout": "^1.2.49",
     "@operato/markdown": "^1.2.35",
     "@operato/popup": "^1.2.38",
-    "@operato/property-editor": "^1.2.49",
+    "@operato/property-editor": "^1.2.50",
     "@operato/styles": "^1.2.35",
     "@operato/utils": "^1.2.35",
     "@polymer/paper-dropdown-menu": "^3.2.0",
@@ -148,5 +148,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "68f7147516a253fe2b359bc7b02c1ef9efb955c8"
+  "gitHead": "b1420af19ed4c47aa4bd215f52e59abb78bb3d4c"
 }

package/src/selector/ox-board-selector.ts

@@ -8,11 +8,11 @@ import { buildArgs, client, gqlContext } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
 import InfiniteScrollable from '@operato/utils/mixins/infinite-scrollable.js'
+import { InheritedValueType } from '@operato/shell'
 
-const FETCH_BOARD_LIST_GQL = (listParam: any) => {
-  return gql`
-  {
-    boards(${buildArgs(listParam)}) {
+const FETCH_BOARD_LIST_GQL = gql`
+  query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!], $inherited: InheritedValueType) {
+    boards(filters: $filters, pagination: $pagination, sortings: $sortings, inherited: $inherited) {
       items {
         id
         name
@@ -23,7 +23,6 @@ const FETCH_BOARD_LIST_GQL = (listParam: any) => {
     }
   }
 `
-}
 
 const FETCH_BOARD_GROUP_LIST_GQL = gql`
   {
@@ -124,13 +123,17 @@ export class BoardSelector extends InfiniteScrollable(localize(i18next)(LitEleme
           box-shadow: var(--box-shadow);
         }
 
+        #filter > div {
+          float: right;
+          margin-left: 10px;
+        }
+
         #filter * {
           font-size: 15px;
         }
 
         select {
           text-transform: capitalize;
-          float: right;
         }
       `
     ]
@@ -139,6 +142,7 @@ export class BoardSelector extends InfiniteScrollable(localize(i18next)(LitEleme
   @property({ type: Array }) groups: { id: string; name: string; description: string }[] = []
   @property({ type: Array }) boards: any[] = []
   @property({ type: String }) group?: string
+  @property({ type: String }) inherited?: InheritedValueType = InheritedValueType.Include
   @property({ type: Boolean }) creatable: boolean = false
   @property({ type: String }) value?: string
 
@@ -154,15 +158,34 @@ export class BoardSelector extends InfiniteScrollable(localize(i18next)(LitEleme
   render() {
     return html`
       <div id="filter">
-        <select
-          @change=${(e: Event) => {
-            this.group = (e.currentTarget as any)?.value
-            this.requestUpdate()
-          }}
-        >
-          <option value="">${i18next.t('label.all')}</option>
-          ${this.groups.map(group => html` <option value=${group.id}>${group.description}</option> `)}
-        </select>
+        <div>
+          <label for="group">Group</label>
+          <select
+            id="group"
+            @change=${(e: Event) => {
+              this.group = (e.currentTarget as any)?.value
+              this.requestUpdate()
+            }}
+          >
+            <option value="">${i18next.t('label.all')}</option>
+            ${this.groups.map(group => html` <option value=${group.id}>${group.description}</option> `)}
+          </select>
+        </div>
+
+        <div>
+          <label for="inherited">Inherited</label>
+          <select
+            id="inherited"
+            @change=${(e: Event) => {
+              this.inherited = (e.currentTarget as any)?.value
+              this.requestUpdate()
+            }}
+          >
+            <option value="Include">Include</option>
+            <option value="Only">Only</option>
+            <option value="None">None</option>
+          </select>
+        </div>
       </div>
 
       <div
@@ -207,7 +230,7 @@ export class BoardSelector extends InfiniteScrollable(localize(i18next)(LitEleme
   }
 
   async updated(changed: PropertyValues<this>) {
-    if (changed.has('group')) {
+    if (changed.has('group') || changed.has('inherited')) {
       this.refreshBoards()
     }
   }
@@ -275,14 +298,17 @@ export class BoardSelector extends InfiniteScrollable(localize(i18next)(LitEleme
         value: this.group
       })
 
-    var params = {
+    var variables = {
       filters,
       sortings,
-      pagination
+      pagination,
+      inherited: this.inherited || InheritedValueType.Include
     }
+
     var boardListResponse = await client.query({
-      query: FETCH_BOARD_LIST_GQL(params),
-      context: gqlContext()
+      query: FETCH_BOARD_LIST_GQL,
+      context: gqlContext(),
+      variables
     })
 
     if (!boardListResponse || !boardListResponse.data) return []