@projectcaluma/ember-form 11.2.0 → 12.0.0

package/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

package/addon/components/cf-field.js

@@ -94,7 +94,10 @@ export default class CfFieldComponent extends Component {
 
   @action
   refreshDynamicOptions() {
-    if (this.args.field.question.isDynamic) {
+    if (
+      this.args.field.question.isDynamic &&
+      this.args.field.question.dynamicOptions.isResolved
+    ) {
       this.args.field.question.dynamicOptions.retry();
     }
   }

package/addon/lib/field.js

@@ -360,7 +360,10 @@ export default class Field extends Base {
     );
 
     if (this.question.isDynamic && hasUnknownValue) {
-      if (!this._fetchUsedDynamicOptions.lastSuccessful) {
+      if (
+        !this._fetchUsedDynamicOptions.lastSuccessful &&
+        this.question.dynamicOptions.isResolved
+      ) {
         // Fetch used dynamic options if not done yet
         this._fetchUsedDynamicOptions.perform();
       }
@@ -776,7 +779,7 @@ export default class Field extends Base {
    * @private
    */
   async _validateDynamicChoiceQuestion() {
-    await this.question.dynamicOptions;
+    await this.question.dynamicOptions.retry();
 
     return this._validateOption(this.answer.value, true);
   }
@@ -796,7 +799,7 @@ export default class Field extends Base {
       return true;
     }
 
-    await this.question.dynamicOptions;
+    await this.question.dynamicOptions.retry();
 
     return this.answer.value
       ? value.map((value) => this._validateOption(value))

package/app/styles/@projectcaluma/ember-form.scss

@@ -1,10 +1,7 @@
 @import "ember-uikit/variables-theme";
-
 @import "../cf-field";
 @import "../cf-navigation";
-
 @import "../flatpickr";
-
 @import "../uikit-overwrites";
 
 .table-controls > .uk-icon {

package/app/styles/_cf-navigation.scss

@@ -1,3 +1,5 @@
+@use "sass:color";
+
 $icon-size: 0.8rem !default;
 
 .cf-navigation {
@@ -13,9 +15,8 @@ $icon-size: 0.8rem !default;
       position: relative;
       height: $icon-size;
       width: $icon-size;
-      color: darken($global-border, 40%);
-      border: 1px solid darken($global-border, 10%);
-
+      color: color.adjust($global-border, $lightness: -40%);
+      border: 1px solid color.adjust($global-border, $lightness: -10%);
       transition: color 500ms ease, border 500ms ease;
 
       &::before {
@@ -36,6 +37,7 @@ $icon-size: 0.8rem !default;
       &--in-progress::before {
         content: "?";
       }
+
       &--valid::before {
         content: "✓";
       }
@@ -48,16 +50,16 @@ $icon-size: 0.8rem !default;
 }
 
 .cf-navigation__item__icon--in-progress.cf-navigation__item__icon--dirty {
-  color: darken($global-warning-background, 20%);
-  border-color: lighten($global-warning-background, 10%);
+  color: color.adjust($global-warning-background, $lightness: -20%);
+  border-color: color.adjust($global-warning-background, $lightness: 10%);
 }
 
 .cf-navigation__item__icon--valid.cf-navigation__item__icon--dirty {
-  color: darken($global-success-background, 20%);
-  border-color: lighten($global-success-background, 10%);
+  color: color.adjust($global-success-background, $lightness: -20%);
+  border-color: color.adjust($global-success-background, $lightness: 10%);
 }
 
 .cf-navigation__item__icon--invalid.cf-navigation__item__icon--dirty {
-  color: darken($global-danger-background, 20%);
-  border-color: lighten($global-danger-background, 10%);
+  color: color.adjust($global-danger-background, $lightness: -20%);
+  border-color: color.adjust($global-danger-background, $lightness: 10%);
 }

package/app/styles/_flatpickr.scss

@@ -1,3 +1,5 @@
+@use "sass:color";
+
 $flatpickr-today-color: $global-warning-background;
 $flatpickr-selected-color: $global-primary-background;
 
@@ -19,8 +21,8 @@ span.flatpickr-day {
     font-weight: 700;
 
     &:hover {
-      background: darken($flatpickr-selected-color, 10%);
-      border-color: darken($flatpickr-selected-color, 10%);
+      background: color.adjust($flatpickr-selected-color, $lightness: -10%);
+      border-color: color.adjust($flatpickr-selected-color, $lightness: -10%);
     }
   }
 }

package/app/styles/_uikit-overwrites.scss

@@ -1,27 +1,23 @@
-// UIkit overwrites
-// ----------------
-// These styles amend UIkit so that disabled form elements can be styled as
-// disabled with a class instead of just by the element's disabled property.
-//
-// There is an open pull request upstream:
-// https://github.com/uikit/uikit/pull/3990
-
-.uk-radio.uk-disabled,
-.uk-checkbox.uk-disabled {
-  cursor: default;
-}
+/* UIkit overwrites
+ * ----------------
+ * These styles amend UIkit so that disabled form elements can be styled as
+ * disabled with a class instead of just by the element's disabled property.
+ *
+ * There is an open pull request upstream:
+ * https://github.com/uikit/uikit/pull/3990 */
 
 .uk-input.uk-disabled,
 .uk-select.uk-disabled,
 .uk-textarea.uk-disabled {
   background-color: $form-disabled-background;
   color: $form-disabled-color;
-  @if (mixin-exists(hook-form-disabled)) {
-    @include hook-form-disabled();
+
+  @if mixin-exists(hook-form-disabled) {
+    @include hook-form-disabled;
   }
 }
 
-.uk-select:not([multiple]):not([size]).uk-disabled {
+.uk-select:not([multiple], [size]).uk-disabled {
   @include svg-fill(
     $internal-form-select-image,
     "#000",
@@ -31,9 +27,11 @@
 
 .uk-radio.uk-disabled,
 .uk-checkbox.uk-disabled {
+  cursor: default;
   background-color: $form-radio-disabled-background;
-  @if (mixin-exists(hook-form-radio-disabled)) {
-    @include hook-form-radio-disabled();
+
+  @if mixin-exists(hook-form-radio-disabled) {
+    @include hook-form-radio-disabled;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "11.2.0",
+  "version": "12.0.0",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -8,17 +8,12 @@
   "license": "LGPL-3.0-or-later",
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
-  "scripts": {
-    "test:ember": "ember test",
-    "test:ember-compatibility": "ember try:each"
-  },
   "dependencies": {
     "@ember/string": "^3.0.1",
     "@embroider/macros": "^1.10.0",
     "@embroider/util": "^1.10.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.2.0",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.6.3",
     "ember-autoresize-modifier": "^0.7.0",
@@ -34,23 +29,22 @@
     "ember-math-helpers": "^3.0.0",
     "ember-power-select": "^7.0.0",
     "ember-resources": "^5.6.4",
-    "ember-uikit": "^7.0.3",
+    "ember-uikit": "^8.0.0",
     "ember-validators": "^4.1.2",
     "graphql": "^15.8.0",
     "jexl": "^2.3.0",
     "lodash.isequal": "^4.5.0",
     "luxon": "^3.3.0",
-    "tracked-toolbox": "^2.0.0"
+    "tracked-toolbox": "^2.0.0",
+    "@projectcaluma/ember-core": "^12.0.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.9.3",
     "@embroider/test-setup": "2.1.1",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.2.0",
-    "@projectcaluma/ember-workflow": "11.2.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "4.11.0",
+    "ember-cli": "4.12.1",
     "ember-cli-code-coverage": "2.0.0",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -69,11 +63,13 @@
     "qunit-dom": "2.0.0",
     "uikit": "3.16.15",
     "uuid": "9.0.0",
-    "webpack": "5.80.0"
+    "webpack": "5.81.0",
+    "@projectcaluma/ember-testing": "12.0.0",
+    "@projectcaluma/ember-workflow": "12.0.0"
   },
   "peerDependencies": {
-    "@projectcaluma/ember-workflow": "^11.2.0",
-    "ember-source": "^3.28.0 || ^4.0.0"
+    "ember-source": "^4.0.0",
+    "@projectcaluma/ember-workflow": "^12.0.0"
   },
   "peerDependenciesMeta": {
     "@projectcaluma/ember-workflow": {
@@ -88,5 +84,9 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
+  },
+  "scripts": {
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
   }
-}
+}