@operato/scene-chartjs 7.0.0-rc.0 → 7.0.0-rc.3

package/schema.graphql

@@ -29,7 +29,7 @@ type AppBinding {
   email: EmailAddress!
   id: ID!
   locale: String
-  name: String
+  name: String!
   owner: Boolean
   reference: String
   refreshToken: String
@@ -133,7 +133,7 @@ type ApprovalLine {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   model: [ApprovalLineItem!]
   name: String
@@ -283,10 +283,11 @@ type AuthProvider {
   clientSecret: String
   createdAt: DateTimeISO
   creator: User
-  domain: Domain!
+  domain: Domain
   id: ID!
   params: Object
   privateKey: String
+  state: String
   tenantId: String
   type: String
   updatedAt: DateTimeISO
@@ -304,7 +305,6 @@ type AuthProviderParameterSpec {
   name: String!
   placeholder: String
   property: Object
-  styles: Object
   type: String!
 }
 
@@ -411,7 +411,7 @@ type BoardTemplate {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   mine: Boolean!
   model: String
@@ -462,7 +462,7 @@ type CommonCode {
   creator: User
   description: String
   details: [CommonCodeDetail!]!
-  domain: Domain!
+  domain: Domain
   id: ID!
   name: String!
   updatedAt: DateTimeISO
@@ -475,9 +475,8 @@ type CommonCodeDetail {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
-  labels: Object
   name: String!
   rank: Float
   updatedAt: DateTimeISO
@@ -494,7 +493,6 @@ input CommonCodeDetailPatch {
   cuFlag: String
   description: String
   id: ID
-  labels: Object
   name: String
   rank: Float
 }
@@ -518,7 +516,6 @@ type Connection {
   creator: User
   description: String
   domain: Domain
-  edge: Appliance
   endpoint: String
   id: ID!
   name: String!
@@ -538,7 +535,6 @@ input ConnectionPatch {
   active: Boolean
   cuFlag: String
   description: String
-  edge: ObjectRef
   endpoint: String
   id: ID
   name: String
@@ -548,8 +544,7 @@ input ConnectionPatch {
 
 type ConnectionState {
   description: String
-  domain: Domain!
-  edge: Appliance
+  domain: Domain
   id: String
   name: String
   state: String
@@ -578,7 +573,7 @@ type Contact {
   creator: User
   deletedAt: DateTimeISO
   department: String
-  domain: Domain!
+  domain: Domain
   email: EmailAddress
   id: ID!
   items: [ContactItem!]
@@ -649,7 +644,7 @@ type Department {
   creator: User
   deletedAt: DateTimeISO
   description: String
-  domain: Domain!
+  domain: Domain
   extension: String
   id: ID!
   manager: Employee
@@ -756,7 +751,7 @@ type Employee {
   creator: User
   deletedAt: DateTimeISO
   department: Department
-  domain: Domain!
+  domain: Domain
   email: EmailAddress
   extension: String
   hiredOn: String
@@ -822,7 +817,7 @@ type Entity {
   dataProp: String
   delStrategy: String
   description: String
-  domain: Domain!
+  domain: Domain
   extEntity: Boolean
   fixedColumns: Float
   id: ID!
@@ -847,7 +842,7 @@ type EntityColumn {
   creator: User
   defVal: String
   description: String
-  domain: Domain!
+  domain: Domain
   entity: Entity!
   formEditor: String
   formFormat: String
@@ -1020,7 +1015,7 @@ type Font {
   active: Boolean!
   createdAt: DateTimeISO
   creator: User
-  domain: Domain!
+  domain: Domain
   files: [Attachment!]
   id: ID!
   name: String!
@@ -1143,14 +1138,14 @@ type LoginHistoryList {
 type Menu {
   buttons: [MenuButton!]!
   category: String
-  children(permittedOnly: Boolean! = false): [Menu!]!
+  children: [Menu!]!
   columns: [MenuColumn!]!
   createdAt: DateTimeISO
   creator: User
   description: String
   detailFormId: String
   detailLayout: String
-  domain: Domain!
+  domain: Domain
   fixedColumns: Float
   gridSaveUrl: String
   hiddenFlag: Boolean
@@ -1162,7 +1157,6 @@ type Menu {
   name: String
   pagination: Boolean
   parent: Menu
-  privilege: PrivilegeObject
   rank: Float
   resourceId: String
   resourceName: String
@@ -1184,7 +1178,7 @@ type MenuButton {
   auth: String
   createdAt: DateTimeISO
   creator: User
-  domain: Domain!
+  domain: Domain
   icon: String
   id: ID!
   logic: String
@@ -1219,7 +1213,7 @@ type MenuColumn {
   creator: User
   defVal: String
   description: String
-  domain: Domain!
+  domain: Domain
   extField: Boolean
   formEditor: String
   formFormat: String
@@ -1308,7 +1302,7 @@ type MenuDetail {
   creator: User
   customView: String
   dataProp: String
-  domain: Domain!
+  domain: Domain
   entityId: String
   id: ID!
   masterField: String
@@ -1325,7 +1319,7 @@ type MenuDetail {
 type MenuDetailButton {
   createdAt: DateTimeISO
   creator: User
-  domain: Domain!
+  domain: Domain
   icon: String
   id: ID!
   logic: String
@@ -1359,7 +1353,7 @@ type MenuDetailColumn {
   creator: User
   defVal: String
   description: String
-  domain: Domain!
+  domain: Domain
   extField: Boolean
   formEditor: String
   formFormat: String
@@ -1484,7 +1478,6 @@ input MenuPatch {
   name: String
   pagination: Boolean
   parent: ObjectRef
-  privilege: PrivilegeInput
   rank: Int
   resourceId: String
   resourceName: String
@@ -1506,9 +1499,6 @@ type Mutation {
   attachContact(contactId: String!, id: String!): Employee!
   cancelInvitation(email: EmailAddress!, reference: String!, type: String!): Boolean!
 
-  """To clear translations cache"""
-  clearTranslationsCache: Boolean!
-
   """To clone a Board from existing Board"""
   cloneBoard(id: String!, patch: BoardPatch!, targetGroupId: String, targetSubdomain: String!): Board!
 
@@ -1995,7 +1985,7 @@ type Mutation {
   """
   To run new scenario instance and will return the result after the scenario stop.
   """
-  runScenario(instanceName: String, scenarioName: String!, variables: Object): ScenarioInstanceRunResult!
+  runScenario(instanceName: String, scenarioName: String!, variables: Object): ScenarioInstance!
   sendInvitation(email: EmailAddress!, reference: String!, type: String!): Invitation!
   singleUpload(file: Upload!): Attachment!
 
@@ -2313,14 +2303,12 @@ input NewCommonCode {
 input NewCommonCodeDetail {
   commonCode: ObjectRef!
   description: String
-  labels: Object
   name: String!
   rank: Float!
 }
 
 input NewConnection {
   description: String
-  edge: ObjectRef
   endpoint: String
   name: String!
   params: String
@@ -2462,7 +2450,6 @@ input NewMenu {
   name: String!
   pagination: Boolean
   parent: ObjectRef
-  privilege: PrivilegeInput
   rank: Int
   resourceId: String
   resourceName: String
@@ -2679,7 +2666,6 @@ input NewScenario {
   privilege: PrivilegeInput
   schedule: String
   timezone: String
-  ttl: Float
   type: String
 }
 
@@ -2738,7 +2724,7 @@ type Notification {
   body: String
   createdAt: DateTimeISO
   creator: User
-  domain: Domain!
+  domain: Domain
   id: ID!
   image: String
   owner: User
@@ -2772,7 +2758,7 @@ type NotificationRule {
   creator: User
   deletedAt: DateTimeISO
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   name: String
 
@@ -2829,7 +2815,7 @@ type Oauth2Client {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   expires: DateTimeISO
   grantType: String
   icon: String
@@ -2962,12 +2948,12 @@ input Pagination {
 }
 
 type Partner {
-  approvedAt: DateTimeISO
+  approvedAt: DateTimeISO!
   approver: User
   domain: Domain!
   id: ID!
   partnerDomain: Domain!
-  requestedAt: DateTimeISO
+  requestedAt: DateTimeISO!
   requester: User
 }
 
@@ -2982,7 +2968,7 @@ type PartnerSetting {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   name: String
   partnerDomain: Domain
@@ -3011,7 +2997,7 @@ input PartnerSettingPatch {
 type PayloadLog {
   createdAt: DateTimeISO
   creator: User
-  domain: Domain!
+  domain: Domain
   endpoint: String!
   id: ID!
   name: String!
@@ -3177,7 +3163,6 @@ type PropertySpec {
   name: String!
   placeholder: String
   property: Object
-  styles: Object
   type: String!
 }
 
@@ -3324,9 +3309,6 @@ type Query {
   """To fetch domains with given privilege for user"""
   domainsWithPrivilege(category: String!, privilege: String!): [Domain!]!
 
-  """To fetch multiple appliance"""
-  edges(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): ApplianceList!
-
   """To fetch a Employee"""
   employee(id: String!): Employee
 
@@ -3433,9 +3415,6 @@ type Query {
   myFavorites: [Favorite!]!
   myLoginHistories(limit: Float!): [LoginHistory!]!
 
-  """To fetch my own Menus"""
-  myMenus(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): MenuList!
-
   """To fetch my notifications"""
   myNotifications(filters: [Filter!], inherited: InheritedValueType, pagination: Pagination, sortings: [Sorting!]): NotificationList!
 
@@ -3590,7 +3569,7 @@ type Role {
   description: String
   domain: Domain!
   id: ID!
-  name: String
+  name: String!
   privileges: [Privilege!]
   updatedAt: DateTimeISO
   updater: User
@@ -3626,7 +3605,7 @@ type Scenario {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   instances: [ScenarioInstance!]
   name: String!
@@ -3640,7 +3619,6 @@ type Scenario {
   state: String
   steps: [Step!]
   timezone: String
-  ttl: Float
   type: String
   updatedAt: DateTimeISO
   updater: User
@@ -3673,17 +3651,6 @@ type ScenarioInstanceProgress {
   steps: Int!
 }
 
-type ScenarioInstanceRunResult {
-  data: Object
-  instanceName: String
-  message: String
-  result: Object
-  scenarioName: String
-  state: String
-  timestamp: DateTimeISO
-  variables: Object
-}
-
 type ScenarioInstanceState {
   data: Object
   domain: Domain
@@ -3720,7 +3687,6 @@ input ScenarioPatch {
   schedule: String
   steps: [StepPatch!]
   timezone: String
-  ttl: Float
   type: String
 }
 
@@ -3735,7 +3701,7 @@ type Setting {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   name: String!
   updatedAt: DateTimeISO
@@ -3772,7 +3738,7 @@ type StateRegister {
   createdAt: DateTimeISO
   creator: User
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   name: String
   refBy: String
@@ -3872,7 +3838,6 @@ type TaskTypeList {
 type Terminology {
   category: String!
   createdAt: DateTimeISO
-  creator: User
   description: String
   display: String!
   domain: Domain!
@@ -3880,7 +3845,6 @@ type Terminology {
   locale: String!
   name: String!
   updatedAt: DateTimeISO
-  updater: User
 }
 
 type TerminologyList {
@@ -3889,12 +3853,12 @@ type TerminologyList {
 }
 
 input TerminologyPatch {
-  category: String
+  category: String!
   cuFlag: String
   description: String
-  display: String
+  display: String!
   id: ID
-  locale: String
+  locale: String!
   name: String
 }
 
@@ -3905,7 +3869,7 @@ type Theme {
   creator: User
   deletedAt: DateTimeISO
   description: String
-  domain: Domain!
+  domain: Domain
   id: ID!
   name: String
   type: String
@@ -3945,7 +3909,7 @@ type User {
   email: EmailAddress!
   id: ID!
   locale: String
-  name: String
+  name: String!
   owner: Boolean
   reference: String
   roles: [Role!]!
@@ -3986,7 +3950,7 @@ type UserRole {
 type UsersAuthProviders {
   authProvider: AuthProvider
   createdAt: DateTimeISO
-  domain: Domain!
+  domain: Domain
   id: ID!
   ssoId: String
   updatedAt: DateTimeISO

package/src/config-converter.ts

@@ -1,4 +1,5 @@
 import { TinyColor } from '@ctrl/tinycolor'
+import { format as formatText } from './text-formatter'
 
 export function convertConfigure(chart: SceneChart.ChartConfig) {
   if (!chart) return
@@ -389,9 +390,12 @@ function _setTooltipCallback(tooltips: SceneChart.ChartTooltipOptions) {
       value = toNumValue.toLocaleString()
     }
 
+    var format = data.datasets?.[tooltipItem.datasetIndex || 0].valueFormat || ''
     var prefix = data.datasets?.[tooltipItem.datasetIndex || 0].valuePrefix || ''
     var suffix = data.datasets?.[tooltipItem.datasetIndex || 0].valueSuffix || ''
 
-    return `${label}: ${prefix + value + suffix}`
+    var stringValue = format ? formatText(format, Number(label)) : Number(label).toLocaleString()
+
+    return `${label}: ${prefix + stringValue + suffix}`
   }
 }

package/src/editors/property-editor-chartjs-abstract.ts

@@ -57,6 +57,17 @@ export default class PropertyEditorChartJSAbstract extends LitElement {
 
   displayValueTemplate() {
     return html`
+      <label for="value-format"> <ox-i18n msgid="label.value-format">Value Format</ox-i18n> </label>
+      <input type="text" value-key="series.valueFormat" .value=${this.series.valueFormat || ''} list="format-list" />
+      <datalist id="format-list">
+        <option value="#,###."></option>
+        <option value="#,###.#"></option>
+        <option value="#,###.0"></option>
+        <option value="#,##0.#"></option>
+        <option value="#,##0.0"></option>
+        <option value="#,##0.0%"></option>
+      </datalist>
+
       <label> <ox-i18n msgid="label.value-prefix">Value Prefix</ox-i18n> </label>
       <input type="text" value-key="series.valuePrefix" .value=${this.series.valuePrefix || ''} />
 

package/src/editors/property-editor-chartjs-pie.ts

@@ -24,6 +24,14 @@ export default class PropertyEditorChartJSPie extends PropertyEditorChartJSAbstr
     this.currentSeriesIndex = 0
   }
 
+  get valueFormat() {
+    return this.series.valueFormat
+  }
+
+  set valueFormat(valueFormat) {
+    this.series.valueFormat = valueFormat
+  }
+
   get valuePrefix() {
     return this.series.valuePrefix
   }

package/src/ox-chart.ts

@@ -7,6 +7,7 @@ import { customElement, property, query } from 'lit/decorators.js'
 import { Chart } from 'chart.js'
 import DataBinderPlugin from './plugins/chartjs-plugin-data-binder'
 import { convertConfigure } from './config-converter'
+import { format as formatText } from './text-formatter'
 
 Chart.plugins.register(DataBinderPlugin)
 
@@ -135,13 +136,15 @@ export class OxChart extends LitElement {
       },
       clamp: true,
       formatter: function (value, context) {
+        //@ts-ignore
+        var format = context.dataset.valueFormat || ''
         //@ts-ignore
         var prefix = context.dataset.valuePrefix || ''
         //@ts-ignore
         var suffix = context.dataset.valueSuffix || ''
         if (value == undefined) return value
 
-        var stringValue = Number(value).toLocaleString()
+        var stringValue = format ? formatText(format, Number(value)) : Number(value).toLocaleString()
         return prefix + stringValue + suffix
       }
     }

package/src/scene-chart.d.ts

@@ -27,6 +27,7 @@ declare namespace SceneChart {
   interface ChartDataSets extends Chart.ChartDataSets {
     color: string
     dataKey: string
+    valueFormat: string
     valuePrefix: string
     valueSuffix: string
     displayValue: string

package/src/text-formatter.ts

@@ -0,0 +1,106 @@
+export function format(mask: string, value: number): string {
+  if (!mask || isNaN(+value)) {
+    return value.toString() // return as it is.
+  }
+
+  let isNegative: boolean,
+    result: string | RegExpMatchArray | null,
+    decimal: string,
+    group: string,
+    posLeadZero: number,
+    posTrailZero: number,
+    posSeparator: number,
+    part: string[],
+    szSep: string[],
+    integer: string,
+    // find prefix/suffix
+    len = mask.length,
+    start = mask.search(/[0-9\-\+#]/),
+    prefix = start > 0 ? mask.substring(0, start) : '',
+    // reverse string: not an ideal method if there are surrogate pairs
+    str = mask.split('').reverse().join(''),
+    end = str.search(/[0-9\-\+#]/),
+    offset = len - end,
+    substr = mask.substring(offset, offset + 1),
+    indx = offset + (substr === '.' || substr === ',' ? 1 : 0),
+    suffix = end > 0 ? mask.substring(indx, len) : '',
+    splittedMask: string[],
+    splittedValue: string[],
+    stringValue: string
+
+  // mask with prefix & suffix removed
+  mask = mask.substring(start, indx)
+
+  // convert any string to number according to formation sign.
+  value = mask.charAt(0) === '-' ? -value : +value
+  isNegative = value < 0 ? ((value = -value), true) : false // process only abs(), and turn on flag.
+
+  // search for separator for grp & decimal, anything not digit, not +/- sign, not #.
+  result = mask.match(/[^\d\-\+#]/g)
+  decimal = '.' // ( result && result[ result.length - 1 ] ) || '.'; // ','는 소수점이 되지 않게 함
+  group = (result && result[1] && result[0]) || ',' // treat the left most symbol as group separator
+
+  // split the decimal for the format string if any.
+  splittedMask = mask.split(decimal)
+  // Fix the decimal first, toFixed will auto fill trailing zero.
+  value = parseFloat(value.toFixed((splittedMask[1] && splittedMask[1].length) || 0))
+  stringValue = +value + '' // convert number to string to trim off *all* trailing decimal zero(es)
+
+  // fill back any trailing zero according to format
+  posTrailZero = (splittedMask[1] && splittedMask[1].lastIndexOf('0')) || 0 // look for last zero in format
+  part = stringValue.split('.')
+  // integer will get !part[1]
+  if (!part[1] || (part[1] && part[1].length <= posTrailZero)) {
+    stringValue = (+value).toFixed(posTrailZero + 1)
+  }
+  szSep = splittedMask[0].split(group) // look for separator
+  splittedMask[0] = szSep.join('') // join back without separator for counting the pos of any leading 0.
+
+  posLeadZero = (splittedMask[0] && splittedMask[0].indexOf('0')) || 0
+  if (posLeadZero > -1) {
+    while (part[0].length < splittedMask[0].length - posLeadZero) {
+      part[0] = '0' + part[0]
+    }
+  } else if (+part[0] === 0) {
+    part[0] = ''
+  }
+
+  splittedValue = stringValue.split('.')
+  splittedValue[0] = part[0]
+
+  // process the first group separator from decimal (.) only, the rest ignore.
+  // get the length of the last slice of split result.
+  posSeparator = (szSep[1] && szSep[szSep.length - 1].length) || 0
+  if (posSeparator) {
+    integer = splittedValue[0]
+    str = ''
+    offset = integer.length % posSeparator
+    len = integer.length
+    for (indx = 0; indx < len; indx++) {
+      str += integer.charAt(indx) // ie6 only support charAt for sz.
+      // -posSeparator so that won't trail separator on full length
+      /* jshint -W018 */
+      if (!((indx - offset + 1) % posSeparator) && indx < len - posSeparator) {
+        str += group
+      }
+    }
+    splittedValue[0] = str
+  }
+  splittedValue[1] = splittedMask[1] && splittedValue[1] ? decimal + splittedValue[1] : ''
+
+  // remove negative sign if result is zero
+  result = splittedValue.join('')
+  if (result === '0' || result === '') {
+    // remove negative sign if result is zero
+    isNegative = false
+  }
+
+  // 앞에 +가 붙는다면 양수일 경우에도 +를 표기해줌
+  let fixedPlusSign: string
+
+  if (splittedMask[0].substring(0, 1) === '+') fixedPlusSign = isNegative ? '-' : '+'
+  else fixedPlusSign = isNegative ? '-' : ''
+
+  // put back any negation, combine integer and fraction, and add back prefix & suffix
+  return prefix + (fixedPlusSign + result) + suffix
+}