@things-factory/shell 4.0.28 → 4.0.33

package/client/elements/oops-progress.js

@@ -1,5 +1,6 @@
-import { LitElement, html } from 'lit-element'
-import { subscribe } from '../graphql-client'
+import { html, LitElement } from 'lit-element'
+
+import { subscribe } from '@operato/graphql'
 
 export class OopsProgress extends LitElement {
   static get properties() {

package/client/entries/public/home.js

@@ -1,5 +1,6 @@
 import '@material/mwc-icon-button'
 import '@material/mwc-button'
+
 import { css, html, LitElement } from 'lit-element'
 
 export class HomePage extends LitElement {
@@ -66,7 +67,7 @@ export class HomePage extends LitElement {
     var { icon, title, description } = this.applicationMeta
 
     return html`
-      <mwc-icon-button home icon="home" @click=${e => (window.location = '/')}></mwc-icon-button>
+      <mwc-icon-button home icon="home" @click=${e => (window.location.href = '/')}></mwc-icon-button>
 
       <div message>
         <strong>${title}</strong>

package/client/index.js

@@ -19,19 +19,14 @@ export * from './actions'
 export * from './app/pages/page-view'
 
 // graphql-client
-export * from './graphql-client'
+export * from '@operato/graphql'
 
 // indexdb-store
 export * from './indexdb'
 
-// mixins
-export * from './mixins'
-
 // elements
 export * from './elements'
 
 // Redux assumes `process.env.NODE_ENV` exists in the ES module build.
 // https://github.com/reactjs/redux/issues/2907
 window.process = { env: { NODE_ENV: 'production' } }
-
-export * from './gql-context'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "4.0.28",
+  "version": "4.0.33",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -44,11 +44,13 @@
     "@material/mwc-icon-button": "^0.25.3",
     "@material/mwc-slider": "^0.25.3",
     "@material/mwc-textfield": "^0.25.3",
-    "@operato/board": "^0.3.4",
-    "@things-factory/ejs-remote": "^4.0.28",
-    "@things-factory/env": "^4.0.28",
-    "@things-factory/styles": "^4.0.28",
-    "@things-factory/utils": "^4.0.28",
+    "@operato/board": "^0.3.14",
+    "@operato/graphql": "^0.3.14",
+    "@operato/utils": "^0.3.14",
+    "@things-factory/ejs-remote": "^4.0.33",
+    "@things-factory/env": "^4.0.33",
+    "@things-factory/styles": "^4.0.33",
+    "@things-factory/utils": "^4.0.33",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
     "apollo-server-core": "^3.5.0",
@@ -122,5 +124,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "fc526e27ae290a6fa3f001ce7ee75a2904b1d363"
+  "gitHead": "0cd5e3b224feb8d526dd5ebc0ee838ff55e2c91c"
 }

package/client/gql-context.js

@@ -1,15 +0,0 @@
-export const CONTEXT_KEY = '__context__'
-
-export function gqlContext() {
-  const search = new URLSearchParams(location.search)
-  return JSON.parse(search.get(CONTEXT_KEY)) || ''
-}
-
-export function buildGqlContext(context) {
-  if (!context) throw new Error('context is not passed')
-  if (typeof context !== 'string') {
-    context = JSON.stringify(context)
-  }
-
-  return new URLSearchParams({ [CONTEXT_KEY]: context }).toString()
-}

package/client/graphql-client.js

@@ -1,161 +0,0 @@
-import { ApolloClient, ApolloLink, HttpLink, InMemoryCache, from } from '@apollo/client/core'
-
-import { SubscriptionClient } from 'subscriptions-transport-ws'
-import { createUploadLink } from 'apollo-upload-client'
-import { onError } from '@apollo/client/link/error'
-
-// import { persistCache } from 'apollo-cache-persist'
-
-export const GRAPHQL_URI = '/graphql'
-
-const defaultOptions = {
-  watchQuery: {
-    fetchPolicy: 'no-cache',
-    errorPolicy: 'ignore'
-  },
-  query: {
-    fetchPolicy: 'no-cache', //'network-only'
-    errorPolicy: 'all'
-  },
-  mutate: {
-    errorPolicy: 'all'
-  }
-}
-
-const ERROR_HANDLER = ({ operation, graphQLErrors, networkError }) => {
-  if (graphQLErrors) {
-    document.dispatchEvent(
-      new CustomEvent('notify', {
-        detail: {
-          level: 'error',
-          message: graphQLErrors[0].message,
-          ex: graphQLErrors
-        }
-      })
-    )
-  }
-
-  if (networkError) {
-    switch (networkError.statusCode) {
-      case 401:
-        /* 401 에러가 리턴되면, 인증이 필요하다는 메시지를 dispatch 한다. 이 auth 모듈 등에서 이 메시지를 받아서 signin 프로세스를 진행할 수 있다. */
-        document.dispatchEvent(new CustomEvent('auth-required'))
-        break
-      case 403:
-        /* 403 에러가 리턴되면, 도메인 정보가 필요하다는 메시지를 dispatch 한다. 이 auth 모듈 등에서 이 메시지를 받아서 domain-register 프로세스 등을 진행할 수 있다. */
-        document.dispatchEvent(new CustomEvent('domain-required'))
-        break
-      default:
-        var { name, response, statusCode, bodyText, message } = networkError
-        if (name == 'ServerParseError') {
-          message = `[ ${statusCode || ''} : ${response.statusText} ] ${bodyText}`
-        } else {
-          message = `[ ${statusCode || ''} : ${response.statusText} ] ${message}`
-        }
-
-        document.dispatchEvent(
-          new CustomEvent('notify', {
-            detail: {
-              level: 'error',
-              message,
-              ex: networkError
-            }
-          })
-        )
-    }
-  }
-}
-
-const cache = new InMemoryCache({
-  addTypename: false
-  // dataIdFromObject: object => object.key
-})
-
-const httpOptions = {
-  GRAPHQL_URI,
-  credentials: 'include'
-}
-
-const httpLink = ApolloLink.split(
-  operation => operation.getContext().hasUpload,
-  createUploadLink(httpOptions),
-  new HttpLink(httpOptions)
-)
-
-// const initPersistCache = async () => {
-//   persistCache({
-//     cache,
-//     storage: window.localStorage
-//   })
-// }
-
-// initPersistCache()
-
-export const client = new ApolloClient({
-  defaultOptions,
-  cache,
-  link: from([onError(ERROR_HANDLER), httpLink])
-})
-
-/* SubscriptionClient */
-var subscriptionClient
-
-const getSubscriptionClient = async () => {
-  if (!subscriptionClient) {
-    subscriptionClient = new Promise((resolve, reject) => {
-      var client = new SubscriptionClient(location.origin.replace(/^http/, 'ws') + '/subscriptions', {
-        reconnect: true,
-        connectionParams: {
-          headers: {
-            /* 
-              특정 도메인의 데이타만 받고자 하는 경우에, referer 정보를 제공해서 서버에서 서브도메인 정보를 취득하도록 한다.
-              referer: location.href
-              또는, 이미 서브도메인 정보를 알고 있다면,
-              'x-things-factory-domain': '[subdomain]'
-              을 보낼 수 있다.
-              관련 정보를 보내지 않는다면, 사용자가 권한을 가진 모든 도메인의 데이타를 수신하게 된다.
-            */
-            referer: location.href
-          }
-        }
-      })
-
-      client.onError(err => {
-        //readyState === 3 인 경우 url을 잘 못 입력했거나, 서버에 문제가 있는 경우이므로 reconnect = false로 변경한다.
-        if (client.status === 3) {
-          client.reconnect = false
-        }
-        reject(err)
-      })
-
-      client.onConnected(() => {
-        resolve(client)
-      })
-    })
-  }
-
-  return await subscriptionClient
-}
-
-var subscriptions = []
-
-export const subscribe = async (request, subscribe) => {
-  var client = await getSubscriptionClient()
-  var { unsubscribe } = client.request(request).subscribe(subscribe)
-
-  subscriptions.push(unsubscribe)
-
-  return {
-    unsubscribe() {
-      subscriptions.splice(subscriptions.indexOf(unsubscribe), 1)
-      unsubscribe()
-
-      if (subscriptions.length == 0) {
-        client.unsubscribeAll()
-        client.close(true)
-
-        subscriptionClient = null
-      }
-    }
-  }
-}

package/client/mixins/index.js

@@ -1 +0,0 @@
-export { default as InfiniteScrollable } from './infinite-scrollable'

package/client/mixins/infinite-scrollable.js

@@ -1,32 +0,0 @@
-import debounce from 'lodash/debounce'
-export default superclass => {
-  return class A extends superclass {
-    constructor() {
-      super()
-
-      this._infiniteScrollOptions = {
-        threshold: 20,
-        limit: 30,
-        totalProp: '_total',
-        pageProp: '_page'
-      }
-
-      this.onScroll = debounce(e => {
-        var el = this.scrollTargetEl
-        var { threshold = 0, limit, totalProp, pageProp } = this._infiniteScrollOptions
-
-        if (this[pageProp] < this[totalProp] / limit && el.scrollHeight - el.clientHeight <= el.scrollTop + threshold) {
-          this.scrollAction()
-        }
-      }, 300)
-    }
-
-    get scrollTargetEl() {
-      console.warn('scroll target element is not defined.')
-    }
-
-    async scrollAction() {
-      console.warn('scroll action not implemented.')
-    }
-  }
-}