@projectcaluma/ember-core 11.0.0-beta.5 → 11.0.0-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/addon/-private/possible-types.js +26 -23
  3. package/addon/caluma-query/index.js +1 -5
  4. package/addon/caluma-query/resource.js +30 -29
  5. package/app/styles/@projectcaluma/ember-core.scss +1 -0
  6. package/app/styles/_cc-uikit-powerselect.scss +31 -0
  7. package/index.js +1 -1
  8. package/package.json +20 -18
package/CHANGELOG.md CHANGED
@@ -1,3 +1,24 @@
1
+ # [@projectcaluma/ember-core-v11.0.0-beta.8](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.7...@projectcaluma/ember-core-v11.0.0-beta.8) (2022-08-02)
2
+
3
+
4
+ ### Features
5
+
6
+ * **analytics:** adds analytics module for caluma ([#1655](https://github.com/projectcaluma/ember-caluma/issues/1655)) ([9573abe](https://github.com/projectcaluma/ember-caluma/commit/9573abe95cd39cb1467113026f2ab7773c3c9143))
7
+
8
+ # [@projectcaluma/ember-core-v11.0.0-beta.7](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.6...@projectcaluma/ember-core-v11.0.0-beta.7) (2022-05-09)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * **resources:** fix deprecations of ember-resources ([7a84c5c](https://github.com/projectcaluma/ember-caluma/commit/7a84c5c78d5b28f7b5393c64722907728dd5f42b))
14
+
15
+ # [@projectcaluma/ember-core-v11.0.0-beta.6](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.5...@projectcaluma/ember-core-v11.0.0-beta.6) (2022-03-23)
16
+
17
+
18
+ ### Bug Fixes
19
+
20
+ * **embroider:** add missing dependency on @ember/string ([3a6e6bb](https://github.com/projectcaluma/ember-caluma/commit/3a6e6bb39a8c1a40a2ae00b3d4ea00606a755e25))
21
+
1
22
  # [@projectcaluma/ember-core-v11.0.0-beta.5](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.4...@projectcaluma/ember-core-v11.0.0-beta.5) (2022-03-11)
2
23
 
3
24
 
package/addon/-private/possible-types.js CHANGED
@@ -1,44 +1,31 @@
1
1
  export default {
2
- Node: [
3
- "Workflow",
4
- "Form",
5
- "Document",
6
- "Case",
7
- "WorkItem",
8
- "Flow",
9
- "DynamicOption",
10
- "Option",
2
+ Question: [
11
3
  "TextQuestion",
12
- "StringAnswer",
13
4
  "ChoiceQuestion",
14
5
  "MultipleChoiceQuestion",
15
- "ListAnswer",
16
6
  "DynamicChoiceQuestion",
17
7
  "DynamicMultipleChoiceQuestion",
18
8
  "TextareaQuestion",
19
9
  "FloatQuestion",
20
- "FloatAnswer",
21
10
  "IntegerQuestion",
22
- "IntegerAnswer",
23
11
  "DateQuestion",
24
- "DateAnswer",
25
12
  "TableQuestion",
26
- "TableAnswer",
27
13
  "FormQuestion",
28
14
  "FileQuestion",
29
15
  "StaticQuestion",
30
- "FileAnswer",
31
- "File",
32
16
  "CalculatedFloatQuestion",
33
17
  "ActionButtonQuestion",
34
- "SimpleTask",
35
- "CompleteWorkflowFormTask",
36
- "CompleteTaskFormTask",
37
18
  ],
38
- Task: ["SimpleTask", "CompleteWorkflowFormTask", "CompleteTaskFormTask"],
39
- Question: [
19
+ Node: [
40
20
  "TextQuestion",
21
+ "Form",
22
+ "Document",
23
+ "Case",
24
+ "Workflow",
25
+ "Flow",
26
+ "WorkItem",
41
27
  "ChoiceQuestion",
28
+ "Option",
42
29
  "MultipleChoiceQuestion",
43
30
  "DynamicChoiceQuestion",
44
31
  "DynamicMultipleChoiceQuestion",
@@ -50,17 +37,33 @@ export default {
50
37
  "FormQuestion",
51
38
  "FileQuestion",
52
39
  "StaticQuestion",
40
+ "StringAnswer",
41
+ "ListAnswer",
42
+ "IntegerAnswer",
43
+ "FloatAnswer",
44
+ "DateAnswer",
45
+ "TableAnswer",
46
+ "FileAnswer",
47
+ "File",
53
48
  "CalculatedFloatQuestion",
54
49
  "ActionButtonQuestion",
50
+ "SimpleTask",
51
+ "CompleteWorkflowFormTask",
52
+ "CompleteTaskFormTask",
53
+ "AnalyticsTable",
54
+ "AvailableField",
55
+ "AnalyticsField",
56
+ "DynamicOption",
55
57
  ],
56
58
  Answer: [
57
59
  "StringAnswer",
58
60
  "ListAnswer",
59
- "FloatAnswer",
60
61
  "IntegerAnswer",
62
+ "FloatAnswer",
61
63
  "DateAnswer",
62
64
  "TableAnswer",
63
65
  "FileAnswer",
64
66
  ],
67
+ Task: ["SimpleTask", "CompleteWorkflowFormTask", "CompleteTaskFormTask"],
65
68
  DynamicQuestion: ["DynamicChoiceQuestion", "DynamicMultipleChoiceQuestion"],
66
69
  };
package/addon/caluma-query/index.js CHANGED
@@ -1,13 +1,9 @@
1
1
  import { getOwner, setOwner } from "@ember/application";
2
- import { useResource } from "ember-resources";
3
2
 
4
3
  import CalumaQueryResource from "@projectcaluma/ember-core/caluma-query/resource";
5
4
 
6
5
  export function useCalumaQuery(destroyable, query, thunk) {
7
- return useResource(destroyable, CalumaQueryResource, () => ({
8
- query,
9
- ...thunk(),
10
- }));
6
+ return CalumaQueryResource.from(destroyable, () => ({ query, ...thunk() }));
11
7
  }
12
8
 
13
9
  export default function calumaQuery({ query, options = {} }) {
package/addon/caluma-query/resource.js CHANGED
@@ -1,47 +1,48 @@
1
1
  import { getOwner, setOwner } from "@ember/application";
2
- import { destroy } from "@ember/destroyable";
2
+ import { destroy, registerDestructor } from "@ember/destroyable";
3
3
  import { action } from "@ember/object";
4
4
  import { tracked } from "@glimmer/tracking";
5
- import { LifecycleResource } from "ember-resources";
5
+ import { Resource } from "ember-resources/core";
6
6
 
7
- export default class CalumaQueryResource extends LifecycleResource {
8
- @tracked query;
9
-
10
- setup() {
11
- const { query, options, queryArgs } = this._parsedArgs;
12
-
13
- this.query = query(options);
14
- setOwner(this.query, getOwner(this));
7
+ const MUTABLE_OPTIONS = [
8
+ "pageSize",
9
+ "processAll",
10
+ "processNew",
11
+ "queryOptions",
12
+ ];
15
13
 
16
- this.query.fetch(queryArgs);
17
- }
14
+ export default class CalumaQueryResource extends Resource {
15
+ @tracked query;
18
16
 
19
- update() {
20
- this._updateOptions();
17
+ didSetup = false;
21
18
 
22
- this.query.fetch(this._parsedArgs.queryArgs);
23
- }
19
+ constructor(owner, args) {
20
+ super(owner, args);
24
21
 
25
- teardown() {
26
- destroy(this.query);
22
+ registerDestructor(this, () => {
23
+ destroy(this.query);
24
+ });
27
25
  }
28
26
 
29
- get _parsedArgs() {
30
- const { query, options = {}, ...queryArgs } = this.args.named;
31
-
32
- return { query, options, queryArgs };
33
- }
27
+ modify(_, { options = {}, query, ...args }) {
28
+ if (!this.didSetup) {
29
+ // initialize the caluma query with the given options
30
+ this.query = query(options);
31
+ setOwner(this.query, getOwner(this));
34
32
 
35
- _updateOptions() {
36
- ["pageSize", "processAll", "processNew", "queryOptions"].forEach(
37
- (optionKey) => {
38
- const option = this._parsedArgs.options[optionKey];
33
+ this.didSetup = true;
34
+ } else {
35
+ // update changed options on the caluma query
36
+ MUTABLE_OPTIONS.forEach((optionKey) => {
37
+ const option = options[optionKey];
39
38
 
40
39
  if (option !== undefined && option !== this.query[optionKey]) {
41
40
  this.query[optionKey] = option;
42
41
  }
43
- }
44
- );
42
+ });
43
+ }
44
+
45
+ this.query.fetch(args);
45
46
  }
46
47
 
47
48
  @action
package/app/styles/@projectcaluma/ember-core.scss ADDED
@@ -0,0 +1 @@
1
+ @import "../cc-uikit-powerselect";
package/app/styles/_cc-uikit-powerselect.scss ADDED
@@ -0,0 +1,31 @@
1
+ @import "ember-uikit/variables-theme";
2
+
3
+ // Backgrounds
4
+ $ember-power-select-selected-background: lighten(
5
+ $global-secondary-background,
6
+ 25%
7
+ ) !default;
8
+ $ember-power-select-highlighted-background: lighten(
9
+ $ember-power-select-selected-background,
10
+ 25%
11
+ ) !default;
12
+ $ember-power-select-multiple-selection-background-color: $ember-power-select-selected-background !default;
13
+
14
+ // Texts
15
+ $ember-power-select-highlighted-color: #ffffff !default;
16
+ $ember-power-select-multiple-selection-color: #ffffff !default;
17
+
18
+ .ember-power-select-option[aria-selected="true"] {
19
+ color: $ember-power-select-highlighted-color;
20
+ }
21
+
22
+ // Borders
23
+ $ember-power-select-focus-outline: 0 !default;
24
+ $ember-power-select-border-color: $global-border !default;
25
+ $ember-power-select-default-border-radius: 0 !default;
26
+ $ember-power-select-multiple-option-border-color: $ember-power-select-border-color !default;
27
+
28
+ // Other
29
+ $ember-power-select-line-height: 38px !default;
30
+ $ember-power-select-multiple-option-padding: 0 8px !default;
31
+ $ember-power-select-multiple-option-line-height: 32px !default;
package/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
 
3
3
  module.exports = {
4
- name: require("./package").name,
4
+ name: require("./package.json").name,
5
5
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@projectcaluma/ember-core",
3
- "version": "11.0.0-beta.5",
3
+ "version": "11.0.0-beta.8",
4
4
  "description": "Ember core addon for working with Caluma.",
5
5
  "keywords": [
6
6
  "ember-addon"
@@ -14,17 +14,19 @@
14
14
  "test:ember-compatibility": "ember try:each"
15
15
  },
16
16
  "dependencies": {
17
- "@apollo/client": "^3.5.10",
18
- "@glimmer/tracking": "^1.0.4",
19
- "ember-apollo-client": "^3.2.0",
20
- "ember-auto-import": "^2.4.0",
17
+ "@apollo/client": "^3.6.9",
18
+ "@ember/string": "^3.0.0",
19
+ "@glimmer/tracking": "^1.1.2",
20
+ "ember-apollo-client": "~4.0.2",
21
+ "ember-auto-import": "^2.4.2",
21
22
  "ember-cli-babel": "^7.26.11",
22
- "ember-cli-htmlbars": "^6.0.1",
23
+ "ember-cli-htmlbars": "^6.1.0",
23
24
  "ember-concurrency": "^2.2.1",
24
25
  "ember-fetch": "^8.1.1",
25
26
  "ember-inflector": "^4.0.2",
26
27
  "ember-intl": "^5.7.2",
27
- "ember-resources": "^4.4.0",
28
+ "ember-resources": "^5.0.2",
29
+ "ember-uikit": "^5.1.3",
28
30
  "graphql": "^15.8.0",
29
31
  "graphql-tag": "^2.12.6",
30
32
  "jexl": "^2.3.0",
@@ -34,18 +36,18 @@
34
36
  "devDependencies": {
35
37
  "@ember/optional-features": "2.0.0",
36
38
  "@ember/render-modifiers": "2.0.4",
37
- "@ember/test-helpers": "2.6.0",
38
- "@embroider/test-setup": "1.5.0",
39
- "@embroider/util": "^1.5.0",
40
- "@faker-js/faker": "6.0.0-beta.0",
41
- "@glimmer/component": "1.0.4",
42
- "@projectcaluma/ember-testing": "11.0.0-beta.4",
39
+ "@ember/test-helpers": "2.8.1",
40
+ "@embroider/test-setup": "1.8.3",
41
+ "@embroider/util": "^1.8.3",
42
+ "@faker-js/faker": "7.3.0",
43
+ "@glimmer/component": "1.1.2",
44
+ "@projectcaluma/ember-testing": "11.0.0-beta.9",
43
45
  "broccoli-asset-rev": "3.0.0",
44
46
  "ember-cli": "3.28.5",
45
47
  "ember-cli-code-coverage": "1.0.3",
46
- "ember-cli-dependency-checker": "3.2.0",
48
+ "ember-cli-dependency-checker": "3.3.1",
47
49
  "ember-cli-inject-live-reload": "2.1.0",
48
- "ember-cli-mirage": "3.0.0-alpha.2",
50
+ "ember-cli-mirage": "3.0.0-alpha.3",
49
51
  "ember-cli-sri": "2.1.1",
50
52
  "ember-cli-terser": "4.0.2",
51
53
  "ember-disable-prototype-extensions": "1.1.3",
@@ -54,14 +56,14 @@
54
56
  "ember-maybe-import-regenerator": "1.0.0",
55
57
  "ember-qunit": "5.1.5",
56
58
  "ember-resolver": "8.0.3",
57
- "ember-source": "3.28.8",
59
+ "ember-source": "3.28.9",
58
60
  "ember-source-channel-url": "3.0.0",
59
61
  "ember-try": "2.0.0",
60
62
  "loader.js": "4.7.0",
61
63
  "npm-run-all": "4.1.5",
62
- "qunit": "2.18.0",
64
+ "qunit": "2.19.1",
63
65
  "qunit-dom": "2.0.0",
64
- "webpack": "5.70.0"
66
+ "webpack": "5.73.0"
65
67
  },
66
68
  "engines": {
67
69
  "node": "12.* || 14.* || >= 16"