Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove jexl logic and hide toggle #233

Merged
merged 1 commit into from May 14, 2019

Conversation

@fkm
Copy link
Contributor

commented May 13, 2019

No description provided.

@fkm fkm force-pushed the fkm:feature/required-textarea branch from 71431ca to cbef8f4 May 13, 2019

@fkm fkm requested a review from czosel May 13, 2019

@fkm fkm changed the title Feature/required textarea fix: remove jexl logic and hide toggle May 13, 2019

@@ -76,7 +76,7 @@
{{/if}}
</div>

{{#if (not-eq f.model.__typename "StaticQuestion")}}
{{#if (and (or (eq f.model.isRequired "true") (eq f.model.isRequired "false")) (not-eq f.model.__typename "StaticQuestion"))}}

This comment has been minimized.

Copy link
@czosel

czosel May 13, 2019

Contributor

I'd extract this into the js file.

This comment has been minimized.

Copy link
@fkm

fkm May 14, 2019

Author Contributor

I agree in principle. But as all the other display logic is in the template, I did so as well.

This comment has been minimized.

Copy link
@czosel

czosel May 14, 2019

Contributor

Yeah, I think the "soft limit" for this kind of logic should be 2-3 assertions. Would you mind extracting it?

This comment has been minimized.

Copy link
@fkm

fkm May 14, 2019

Author Contributor

"Soft limit"?

Anyways. Is there a good way to observe a Changeset in a computed property?

This comment has been minimized.

Copy link
@czosel

czosel May 14, 2019

Contributor

Looks like you found out 👍

This comment has been minimized.

Copy link
@fkm

fkm May 14, 2019

Author Contributor

Nope. This doesn't work.

This comment has been minimized.

Copy link
@czosel

czosel May 14, 2019

Contributor

maybe @anehx can help?

@fkm fkm force-pushed the fkm:feature/required-textarea branch from cbef8f4 to 2b9709b May 14, 2019

@czosel

czosel approved these changes May 14, 2019

@fkm fkm changed the title fix: remove jexl logic and hide toggle WIP fix: remove jexl logic and hide toggle May 14, 2019

@fkm fkm requested a review from czosel May 14, 2019

@fkm fkm force-pushed the fkm:feature/required-textarea branch from 2b9709b to c5decca May 14, 2019

@fkm fkm changed the title WIP fix: remove jexl logic and hide toggle fix: remove jexl logic and hide toggle May 14, 2019

@czosel

czosel approved these changes May 14, 2019

Copy link
Contributor

left a comment

Nice!

@czosel czosel merged commit 9627dec into projectcaluma:master May 14, 2019

3 checks passed

Travis CI - Pull Request Build Passed
Details
codecov/patch 100% of diff hit (target 88.75%)
Details
codecov/project Absolute coverage decreased by -0.32% but relative coverage increased by +11.24% compared to 2f5a197
Details

czosel pushed a commit that referenced this pull request May 22, 2019

chore(release): 0.1.0 [skip ci]
# [0.1.0](v0.0.4...v0.1.0) (2019-05-22)

### Bug Fixes

* **cf-navigation:** add compute watcher on hidden state ([#225](#225)) ([41ba470](41ba470))
* **cf-navigation:** add minor safety checks ([#217](#217)) ([cf3ca9e](cf3ca9e))
* **cf-navigation:** auto-link empty form sections to first subsection ([#185](#185)) ([a50a442](a50a442))
* **deps:** downgrade to jexl 1.x for IE 11 compat ([#197](#197)) ([cca7d03](cca7d03))
* **deps:** Move ember-cli-showdown to dependencies ([#171](#171)) ([2dca978](2dca978))
* **deps:** remove obsolete dependency ([be4dbad](be4dbad))
* **deps:** update @adfinis-sygroup/semantic-release-config ([2225e00](2225e00))
* **deps:** update dependency ember-cli-sass to v10 ([#32](#32)) ([2877c64](2877c64))
* **deps:** update dependency ember-composable-helpers to v2.3.1 ([#156](#156)) ([0a1498d](0a1498d))
* **deps:** update dependency ember-uikit to ^0.8.0 ([#219](#219)) ([28a841b](28a841b))
* **deps:** update dependency ember-uikit to v0.8.1 ([#223](#223)) ([b892a50](b892a50))
* **deps:** update dependency graphql to v14.3.0 ([#208](#208)) ([6cf38cc](6cf38cc))
* **deps:** update dependency sass to v1.20.1 ([#196](#196)) ([1d7a944](1d7a944))
* **field:** drop running requests on next ([aa5f99c](aa5f99c))
* **field:** fix invalid state of a field ([8c3d6b4](8c3d6b4))
* **form builder:** fix handling of existing metadata ([4d9071f](4d9071f))
* **form builder:** fix usage of nested properties in the question editor ([97a59a5](97a59a5))
* **ie 11:** add "manual" polyfill for array.flat ([#199](#199)) ([fde3a0f](fde3a0f))
* **info:** replace drop by modal ([#193](#193)) ([ea2a026](ea2a026))
* **jexl:** add custom intersects operator to jexl AST parser ([#183](#183)) ([30ddf10](30ddf10))
* **jexl:** don't consider the value of hidden fields in JEXL expr. ([#198](#198)) ([f934741](f934741))
* **mirage:** update mirage schema and fix generic scalar type ([c1cdaa1](c1cdaa1))
* **navigation:** fix document states in navigation ([480b67b](480b67b))
* **powerselect:** render correct slected option for choice questions ([#254](#254)) ([837ca8c](837ca8c))
* **table:** dialog didn't reopen ([#243](#243)) ([7754585](7754585))
* **table:** disable form in table on disabled question ([c79a380](c79a380))
* **table:** fix table rendering for dynamic choice fields ([#239](#239)) ([5d40c13](5d40c13))
* consider empty but required fields ([#220](#220)) ([3538471](3538471))
* do not display warning if no override ([3c2bf1d](3c2bf1d))
* **table:** render download links for file questions in tables ([#187](#187)) ([25cfd80](25cfd80))
* **translations:** add missing german translations ([#152](#152)) ([dba21ec](dba21ec))
* **translations:** add missing translations ([e786b52](e786b52))
* **validation:** add validation for static, fix multiple choice ([#228](#228)) ([7ab76a7](7ab76a7))
* **validation:** ignore hidden required fields ([#175](#175)) ([2d1f490](2d1f490))
* remove jexl logic and hide toggle ([#233](#233)) ([9627dec](9627dec))

### Features

* **cf-form:** all passing context information to cf-form, cf-navigation ([7372e4d](7372e4d))
* **cf-form:** allow passing context information to cf-form, cf-navigation ([#218](#218)) ([2955dc6](2955dc6))
* **cf-navigation:** add disabled attribute ([#242](#242)) ([926b9de](926b9de))
* **cf-navigation:** add possibility to pass custom headers ([#255](#255)) ([16e4448](16e4448))
* **form:** add support for static question ([#169](#169)) ([17afa26](17afa26))
* **form:** enable widget overrides for forms ([581de15](581de15))
* **jexl:** add "interesects" binary operator ([#176](#176)) ([502c747](502c747))
* **jexl:** add cross-form jexl resolution ([#154](#154)) ([c137e29](c137e29)), closes [/github.com/projectcaluma/caluma/pull/398#discussion_r279346810](https://github.com//github.com/projectcaluma/caluma/pull/398/issues/discussion_r279346810)
* **jexl:** add support for multiline expressions ([#177](#177)) ([8fb2b6b](8fb2b6b))
* **jexl:** support jexl referencing TableQuestions ([#229](#229)) ([858d95e](858d95e))
* **table:** remove action buttons in disabled state ([#238](#238)) ([9037a3b](9037a3b))
* **table:** show spinner while saving ([fe4fc33](fe4fc33))
* **tooling:** add semantic release ([#200](#200)) ([64b943c](64b943c))
* add jexl textarea for isRequired ([#232](#232)) ([7b3e16a](7b3e16a))
* add table column display configuration ([#237](#237)) ([88a1ae9](88a1ae9)), closes [#236](#236)

czosel pushed a commit that referenced this pull request May 22, 2019

chore(release): 0.2.0 [skip ci]
# [0.2.0](v0.1.0...v0.2.0) (2019-05-22)

### Bug Fixes

* **cf-navigation:** add compute watcher on hidden state ([#225](#225)) ([41ba470](41ba470))
* **cf-navigation:** add minor safety checks ([#217](#217)) ([cf3ca9e](cf3ca9e))
* **deps:** remove obsolete dependency ([be4dbad](be4dbad))
* **deps:** update @adfinis-sygroup/semantic-release-config ([2225e00](2225e00))
* **deps:** update dependency ember-uikit to ^0.8.0 ([#219](#219)) ([28a841b](28a841b))
* **deps:** update dependency ember-uikit to v0.8.1 ([#223](#223)) ([b892a50](b892a50))
* **deps:** update dependency graphql to v14.3.0 ([#208](#208)) ([6cf38cc](6cf38cc))
* **deps:** update dependency sass to v1.20.1 ([#196](#196)) ([1d7a944](1d7a944))
* **field:** drop running requests on next ([aa5f99c](aa5f99c))
* **field:** fix invalid state of a field ([8c3d6b4](8c3d6b4))
* **form builder:** fix handling of existing metadata ([4d9071f](4d9071f))
* **form builder:** fix usage of nested properties in the question editor ([97a59a5](97a59a5))
* **ie 11:** add "manual" polyfill for array.flat ([#199](#199)) ([fde3a0f](fde3a0f))
* **mirage:** update mirage schema and fix generic scalar type ([c1cdaa1](c1cdaa1))
* **navigation:** fix document states in navigation ([480b67b](480b67b))
* **powerselect:** render correct slected option for choice questions ([#254](#254)) ([837ca8c](837ca8c))
* **table:** dialog didn't reopen ([#243](#243)) ([7754585](7754585))
* **table:** disable form in table on disabled question ([c79a380](c79a380))
* **table:** fix table rendering for dynamic choice fields ([#239](#239)) ([5d40c13](5d40c13))
* **translations:** add missing translations ([e786b52](e786b52))
* consider empty but required fields ([#220](#220)) ([3538471](3538471))
* **validation:** add validation for static, fix multiple choice ([#228](#228)) ([7ab76a7](7ab76a7))
* do not display warning if no override ([3c2bf1d](3c2bf1d))
* remove jexl logic and hide toggle ([#233](#233)) ([9627dec](9627dec))

### Features

* **cf-form:** all passing context information to cf-form, cf-navigation ([7372e4d](7372e4d))
* **cf-form:** allow passing context information to cf-form, cf-navigation ([#218](#218)) ([2955dc6](2955dc6))
* add jexl textarea for isRequired ([#232](#232)) ([7b3e16a](7b3e16a))
* add table column display configuration ([#237](#237)) ([88a1ae9](88a1ae9)), closes [#236](#236)
* **cf-navigation:** add disabled attribute ([#242](#242)) ([926b9de](926b9de))
* **cf-navigation:** add possibility to pass custom headers ([#255](#255)) ([16e4448](16e4448))
* **form:** enable widget overrides for forms ([581de15](581de15))
* **jexl:** support jexl referencing TableQuestions ([#229](#229)) ([858d95e](858d95e))
* **table:** remove action buttons in disabled state ([#238](#238)) ([9037a3b](9037a3b))
* **table:** show spinner while saving ([fe4fc33](fe4fc33))
@czosel

This comment has been minimized.

Copy link
Contributor

commented May 22, 2019

🎉 This PR is included in version 0.2.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@czosel czosel added the released label May 22, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.