ember-validated-form 5.2.1 → 5.3.1

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+## [5.3.1](https://github.com/adfinis-sygroup/ember-validated-form/compare/v5.3.0...v5.3.1) (2022-09-02)
+
+
+### Bug Fixes
+
+* **select:** fix promptIsSelectable in combination with targetPath ([#853](https://github.com/adfinis-sygroup/ember-validated-form/issues/853)) ([526d81f](https://github.com/adfinis-sygroup/ember-validated-form/commit/526d81f25eb47f938fa2fa031d5f5e710a0386bf))
+
+# [5.3.0](https://github.com/adfinis-sygroup/ember-validated-form/compare/v5.2.2...v5.3.0) (2022-02-22)
+
+
+### Bug Fixes
+
+* addon docs root url ([7d8151f](https://github.com/adfinis-sygroup/ember-validated-form/commit/7d8151fa9d854cdf9595f27347fa57652e58ef10))
+* **blueprint:** add ember-truth-helpers to default blueprint ([a401589](https://github.com/adfinis-sygroup/ember-validated-form/commit/a401589dab6d013f5d659865927919346655295d))
+* **deps:** move required deps to dependencies instead of devDependencies ([46629ce](https://github.com/adfinis-sygroup/ember-validated-form/commit/46629ceb48210bbc58898c299a9388ce7fa816ec))
+* new link to docs ([c1073e5](https://github.com/adfinis-sygroup/ember-validated-form/commit/c1073e55e3a916ed393e33bcf4a045124c320967))
+* **select:** pass prompt argument down to input component ([64a1377](https://github.com/adfinis-sygroup/ember-validated-form/commit/64a1377d64618fa880b332f8a693e1c7f1a321f7))
+
+
+### Features
+
+* pass attributes to input components ([dc0417d](https://github.com/adfinis-sygroup/ember-validated-form/commit/dc0417d125fe4c20cb59b76531ae4f7391258259))
+
+## [5.2.2](https://github.com/adfinis-sygroup/ember-validated-form/compare/v5.2.1...v5.2.2) (2022-02-10)
+
+
+### Bug Fixes
+
+* select support for plain options ([#747](https://github.com/adfinis-sygroup/ember-validated-form/issues/747)) ([a58e26d](https://github.com/adfinis-sygroup/ember-validated-form/commit/a58e26ddcd46ec5328c3bb5351bafc7781eacdbd))
+
 ## [5.2.1](https://github.com/adfinis-sygroup/ember-validated-form/compare/v5.2.0...v5.2.1) (2022-02-09)
 
 

package/README.md

@@ -9,7 +9,7 @@ Easily create forms with client side validations.
 
 ![gif](https://raw.githubusercontent.com/adfinis-sygroup/ember-validated-form/main/demo.gif)
 
-Want to try it yourself? [View the docs here.](https://adfinis-sygroup.github.io/ember-validated-form/)
+Want to try it yourself? [View the docs here.](https://docs.adfinis.com/ember-validated-form/)
 
 # Contributing
 

package/addon/components/validated-input/-themes/uikit/render.hbs

@@ -1,3 +1,4 @@
+{{! template-lint-disable no-autofocus-attribute }}
 <div class={{this.class}}>
   {{#if (not-eq @type "checkbox")}}
     <@labelComponent />
@@ -18,10 +19,12 @@
           @options={{@options}}
           @optionTargetPath={{@optionTargetPath}}
           @optionValuePath={{@optionValuePath}}
+          @prompt={{@prompt}}
           @promptIsSelectable={{@promptIsSelectable}}
           @setDirty={{@setDirty}}
           @update={{@update}}
           @value={{@value}}
+          ...attributes
         />
       {{/let}}
     {{else if (or (eq @type "radioGroup") (eq @type "radio-group"))}}
@@ -36,6 +39,7 @@
           @setDirty={{@setDirty}}
           @update={{@update}}
           @value={{@value}}
+          ...attributes
         />
       {{/let}}
     {{else if (or (eq @type "checkboxGroup") (eq @type "checkbox-group"))}}
@@ -50,6 +54,7 @@
           @setDirty={{@setDirty}}
           @update={{@update}}
           @value={{@value}}
+          ...attributes
         />
       {{/let}}
     {{else if (eq @type "checkbox")}}
@@ -65,6 +70,7 @@
           @setDirty={{@setDirty}}
           @update={{@update}}
           @value={{@value}}
+          ...attributes
         />
       {{/let}}
     {{else if (eq @type "textarea")}}
@@ -83,6 +89,7 @@
           @isValid={{@isValid}}
           @setDirty={{@setDirty}}
           @update={{@update}}
+          ...attributes
         />
       {{/let}}
     {{else}}
@@ -100,6 +107,7 @@
           @isValid={{@isValid}}
           @setDirty={{@setDirty}}
           @update={{@update}}
+          ...attributes
         />
       {{/let}}
     {{/if}}

package/addon/components/validated-input/render.hbs

@@ -1,3 +1,4 @@
+{{! template-lint-disable no-autofocus-attribute }}
 <div class={{this.class}}>
   {{#if (not-eq @type "checkbox")}}
     <@labelComponent />
@@ -17,10 +18,12 @@
         @options={{@options}}
         @optionTargetPath={{@optionTargetPath}}
         @optionValuePath={{@optionValuePath}}
+        @prompt={{@prompt}}
         @promptIsSelectable={{@promptIsSelectable}}
         @setDirty={{@setDirty}}
         @update={{@update}}
         @value={{@value}}
+        ...attributes
       />
     {{/let}}
   {{else if (or (eq @type "radioGroup") (eq @type "radio-group"))}}
@@ -35,6 +38,7 @@
         @setDirty={{@setDirty}}
         @update={{@update}}
         @value={{@value}}
+        ...attributes
       />
     {{/let}}
   {{else if (or (eq @type "checkboxGroup") (eq @type "checkbox-group"))}}
@@ -49,6 +53,7 @@
         @setDirty={{@setDirty}}
         @update={{@update}}
         @value={{@value}}
+        ...attributes
       />
     {{/let}}
   {{else if (eq @type "checkbox")}}
@@ -64,6 +69,7 @@
         @setDirty={{@setDirty}}
         @update={{@update}}
         @value={{@value}}
+        ...attributes
       />
     {{/let}}
   {{else if (eq @type "textarea")}}
@@ -82,6 +88,7 @@
         @isValid={{@isValid}}
         @setDirty={{@setDirty}}
         @update={{@update}}
+        ...attributes
       />
     {{/let}}
   {{else}}
@@ -99,6 +106,7 @@
         @isValid={{@isValid}}
         @setDirty={{@setDirty}}
         @update={{@update}}
+        ...attributes
       />
     {{/let}}
   {{/if}}

package/addon/components/validated-input/types/checkbox-group.hbs

@@ -8,6 +8,7 @@
       id="{{@inputId}}-{{i}}"
       disabled={{@disabled}}
       {{on "input" (fn this.onUpdate option.key)}}
+      ...attributes
     />
     {{option.label}}
   </label>

package/addon/components/validated-input/types/checkbox.hbs

@@ -5,5 +5,6 @@
   disabled={{@disabled}}
   checked={{@value}}
   {{on "input" this.onUpdate}}
+  ...attributes
 />
 <@labelComponent />

package/addon/components/validated-input/types/input.hbs

@@ -1,6 +1,6 @@
 <input
   class={{this.class}}
-  ...attributes
   {{on "input" this.onUpdate}}
   {{on "blur" @setDirty}}
+  ...attributes
 />

package/addon/components/validated-input/types/radio-group.hbs

@@ -8,6 +8,7 @@
       id="{{@inputId}}-{{i}}"
       disabled={{@disabled}}
       {{on "input" (fn this.onUpdate option.key)}}
+      ...attributes
     />
     {{option.label}}
   </label>

package/addon/components/validated-input/types/select.hbs

@@ -1,12 +1,12 @@
 <select
   class={{this.class}}
-  ...attributes
   name={{@name}}
   id={{@inpudId}}
   disabled={{@disabled}}
   multiple={{@multiple}}
   {{on "change" this.onUpdate}}
   {{on "blur" this.onBlur}}
+  ...attributes
 >
   {{#if (or @prompt @includeBlank)}}
     <option
@@ -20,53 +20,17 @@
     {{#each this.optionGroups as |optionGroup|}}
       <optgroup label={{optionGroup.groupName}}>
         {{#each optionGroup.options as |opt|}}
-          {{#let
-            (if
-              (or @optionValuePath @optionTargetPath)
-              (get opt (or @optionValuePath @optionTargetPath))
-              opt
-            )
-            as |optionValue|
-          }}
-            <option
-              selected={{eq optionValue @value}}
-              value={{optionValue}}
-            >{{#if @optionLabelPath}}
-                {{get opt @optionLabelPath}}
-              {{else if @optionValuePath}}
-                {{get opt @optionValuePath}}
-              {{else if @optionTargetPath}}
-                {{get opt @optionTargetPath}}
-              {{else}}
-                {{opt}}
-              {{/if}}
-            </option>
-          {{/let}}
+          <option selected={{eq opt.id @value}} value={{opt.id}}>
+            {{opt.label}}
+          </option>
         {{/each}}
       </optgroup>
     {{/each}}
   {{else}}
-    {{#each @options as |opt|}}
-      {{#let
-        (if
-          (or @optionValuePath @optionTargetPath)
-          (get opt (or @optionValuePath @optionTargetPath))
-          opt
-        )
-        as |optionValue|
-      }}
-        <option selected={{eq optionValue @value}} value={{optionValue}}>{{#if
-            @optionLabelPath
-          }}
-            {{get opt @optionLabelPath}}
-          {{else if @optionValuePath}}
-            {{get opt @optionValuePath}}
-          {{else if @optionTargetPath}}
-            {{get opt @optionTargetPath}}
-          {{else}}
-            {{opt}}
-          {{/if}}</option>
-      {{/let}}
+    {{#each this.normalizedOptions as |opt|}}
+      <option selected={{eq opt.id @value}} value={{opt.id}}>
+        {{opt.label}}
+      </option>
     {{/each}}
   {{/if}}
 </select>

package/addon/components/validated-input/types/select.js

@@ -23,6 +23,7 @@ export default class SelectComponent extends Component {
           until: "6.0.0",
           since: "5.1.0",
           url: "https://github.com/adfinis-sygroup/ember-validated-form/releases/tag/v5.1.0",
+          for: "ember-validated-form",
         }
       );
     }
@@ -38,6 +39,23 @@ export default class SelectComponent extends Component {
     return this.hasPreGroupedOptions || this.args.groupLabelPath;
   }
 
+  get normalizedOptions() {
+    // normalize options to common data structure, only for rendering
+    return this.args.options.map((opt) => this.normalize(opt));
+  }
+
+  normalize(option) {
+    if (typeof option !== "object") {
+      return { id: option, label: option };
+    }
+    const valuePath = this.args.optionValuePath ?? this.args.optionTargetPath;
+    const labelPath = this.args.optionLabelPath;
+    return {
+      id: valuePath ? option[valuePath] : option.id,
+      label: labelPath ? option[labelPath] : option.label,
+    };
+  }
+
   get optionGroups() {
     const groupLabelPath = this.args.groupLabelPath;
     if (!groupLabelPath) {
@@ -60,7 +78,7 @@ export default class SelectComponent extends Component {
           groups.pushObject(group);
         }
 
-        group.options.pushObject(item);
+        group.options.pushObject(this.normalize(item));
       } else {
         groups.pushObject(item);
       }
@@ -72,6 +90,17 @@ export default class SelectComponent extends Component {
   findOption(target) {
     const targetPath = this.args.optionTargetPath;
     const valuePath = this.args.optionValuePath || targetPath;
+
+    const getValue = (item) => {
+      if (valuePath) {
+        return String(item[valuePath]);
+      }
+      if (typeof item === "object") {
+        return String(item.id);
+      }
+      return String(item);
+    };
+
     let options = this.args.options;
 
     //flatten pre grouped options
@@ -85,9 +114,9 @@ export default class SelectComponent extends Component {
         .call(target.options, (option) => option.selected)
         .map((option) => option.value);
 
-      const foundOptions = options.filter((item) =>
-        selectedValues.includes(`${valuePath ? item[valuePath] : item}`)
-      );
+      const foundOptions = options.filter((item) => {
+        return selectedValues.includes(getValue(item));
+      });
       if (targetPath) {
         return foundOptions.map((item) => item[targetPath]);
       }
@@ -95,10 +124,10 @@ export default class SelectComponent extends Component {
     }
 
     //single select
-    const foundOption = options.find(
-      (item) => `${valuePath ? item[valuePath] : item.value}` === target.value
-    );
-    if (targetPath) {
+    const foundOption = options.find((item) => getValue(item) === target.value);
+
+    // If @promptIsSelectable is set to true, foundOption in this case will be undefined.
+    if (targetPath && foundOption) {
       return foundOption[targetPath];
     }
     return foundOption;

package/addon/components/validated-input/types/textarea.hbs

@@ -1,7 +1,7 @@
 <textarea
   class={{this.class}}
-  ...attributes
   {{on "input" this.onUpdate}}
   {{on "blur" @setDirty}}
+  ...attributes
 >
 </textarea>

package/addon/components/validated-input.hbs

@@ -48,6 +48,7 @@
       @isInvalid={{this.isInvalid}}
       @placeholder={{@placeholder}}
       @class={{@class}}
+      @prompt={{@prompt}}
       @promptIsSelectable={{@promptIsSelectable}}
       @optionLabelPath={{@optionLabelPath}}
       @optionValuePath={{@optionValuePath}}
@@ -69,6 +70,7 @@
         (and this.showValidity this.errors)
         (component this.errorComponent errors=this.errors)
       }}
+      ...attributes
     />
   {{/let}}
 {{/if}}

package/blueprints/ember-validated-form/index.js

@@ -10,6 +10,7 @@ module.exports = {
       packages: [
         { name: "ember-changeset" },
         { name: "ember-changeset-validations" },
+        { name: "ember-truth-helpers" },
       ],
     });
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-validated-form",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "description": "Easily create forms with client-side validations",
   "keywords": [
     "ember-addon",
@@ -14,7 +14,7 @@
   "directories": {
     "test": "tests"
   },
-  "homepage": "https://adfinis-sygroup.github.io/ember-validated-form",
+  "homepage": "https://docs.adfinis.com/ember-validated-form",
   "bugs": {
     "url": "https://github.com/adfinis-sygroup/ember-validated-form/issues"
   },
@@ -33,77 +33,62 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.0",
-    "ember-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^5.7.1",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "ember-auto-import": "^2.4.2",
+    "ember-changeset": "^4.1.0",
+    "ember-changeset-validations": "^4.1.0",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-truth-helpers": "^3.0.0"
   },
   "devDependencies": {
     "@adfinis-sygroup/eslint-config": "1.5.0",
     "@adfinis-sygroup/semantic-release-config": "3.4.0",
-    "@babel/core": "7.16.12",
-    "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-    "@babel/helper-environment-visitor": "^7.16.7",
-    "@babel/plugin-proposal-decorators": "^7.16.7",
-    "@babel/plugin-transform-modules-amd": "^7.16.7",
-    "@babel/preset-env": "^7.16.11",
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.45.0",
-    "@fortawesome/ember-fontawesome": "0.2.3",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@glimmer/component": "1.0.4",
-    "@glimmer/tracking": "1.0.4",
+    "@ember/test-helpers": "2.8.1",
+    "@embroider/test-setup": "1.6.0",
+    "@fortawesome/ember-fontawesome": "0.4.0",
+    "@fortawesome/free-solid-svg-icons": "6.1.1",
     "babel-eslint": "10.1.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-changeset": "4.0.0-beta.2",
-    "ember-changeset-validations": "4.0.0-beta.2",
-    "ember-cli": "3.28.1",
-    "ember-cli-addon-docs": "4.2.1",
-    "ember-cli-dependency-checker": "3.2.0",
+    "ember-cli": "4.3.0",
+    "ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#667701d60650cf7af51611dbff9abf1879776421",
+    "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-deploy": "1.0.2",
     "ember-cli-deploy-build": "2.0.0",
     "ember-cli-deploy-git": "1.3.4",
     "ember-cli-deploy-git-ci": "1.0.1",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-release": "1.0.0-beta.2",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-cli-test-loader": "3.0.0",
-    "ember-concurrency": "2.2.0",
-    "ember-data": "3.28.3",
+    "ember-concurrency": "2.2.1",
+    "ember-data": "4.4.0",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-load-initializers": "2.1.2",
-    "ember-maybe-import-regenerator": "1.0.0",
-    "ember-power-select": "5.0.3",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.1",
+    "ember-source": "4.6.0",
     "ember-source-channel-url": "3.0.0",
-    "ember-template-lint": "3.15.0",
-    "ember-template-lint-plugin-prettier": "2.0.1",
-    "ember-try": "1.4.0",
+    "ember-template-lint": "4.12.0",
+    "ember-template-lint-plugin-prettier": "4.0.0",
+    "ember-try": "2.0.0",
     "eslint": "7.32.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-ember": "10.5.8",
-    "eslint-plugin-import": "2.25.4",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-ember": "10.6.1",
+    "eslint-plugin-import": "2.26.0",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-qunit": "6.2.0",
-    "husky": "7.0.4",
-    "lint-staged": "11.2.0",
+    "eslint-plugin-qunit": "7.2.0",
+    "husky": "8.0.1",
+    "lint-staged": "13.0.3",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.5.1",
-    "qunit": "2.17.2",
+    "prettier": "2.7.1",
+    "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "webpack": "5.67.0"
-  },
-  "resolutions": {
-    "graceful-fs": ">=4.2.0",
-    "@embroider/macros": "^1.0.0",
-    "@embroider/core": "^1.0.0",
-    "@embroider/util": "^1.0.0"
+    "webpack": "5.74.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
@@ -113,7 +98,7 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
-    "demoURL": "https://adfinis-sygroup.github.io/ember-validated-form"
+    "demoURL": "https://docs.adfinis.com/ember-validated-form"
   },
   "release": {
     "extends": "@adfinis-sygroup/semantic-release-config"

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +0,0 @@
----
-name: Bug report
-about: Template for bug reports
----
-
---
-If possible, please consider creating a basic reproduction of your issue with Ember Twiddle. You can use this twiddle as a starting point:
-
-https://ember-twiddle.com/3691a8576c35ff149bfc26a564ec5437

package/.github/dependabot.yml

@@ -1,11 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "friday"
-      time: "12:00"
-      timezone: "Europe/Zurich"
-    open-pull-requests-limit: 10
-    versioning-strategy: increase

package/.github/workflows/deploy.yml

@@ -1,28 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    branches:
-      - main
-  release:
-    types: [published]
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-
-      - name: Install Dependencies
-        run: yarn install
-
-      - name: Deploy to Github Pages
-        run: yarn ember deploy production
-        env:
-          CI: true
-          DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-          ADDON_DOCS_UPDATE_LATEST: true

package/.github/workflows/release.yml

@@ -1,25 +0,0 @@
-name: Release
-
-on: workflow_dispatch
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Release on NPM
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: yarn semantic-release

package/.github/workflows/test.yml

@@ -1,84 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: [ubuntu-latest]
-
-    strategy:
-      matrix:
-        target: [js, hbs]
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Lint ${{ matrix.target }}
-        run: yarn lint:${{ matrix.target }}
-
-  test:
-    name: Tests
-    needs: [lint]
-    runs-on: [ubuntu-latest]
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-
-      - name: Install dependencies (no lockfile)
-        run: yarn install --no-lockfile
-
-      - name: Run tests (floating dependencies)
-        run: yarn test:ember
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Run tests
-        run: yarn test:ember
-        env:
-          COVERAGE: true
-
-      - name: Upload coverage report to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          file: ./coverage/lcov.info
-
-  try-one:
-    name: Additional Tests
-    needs: [test]
-    runs-on: [ubuntu-latest]
-
-    strategy:
-      matrix:
-        scenario:
-          - ember-lts-3.24
-          - ember-lts-3.28
-          - ember-release
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Run tests
-        run: yarn ember try:one ${{ matrix.scenario }}