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

feat(float): add step configuration #2887

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@
step="any"
/>
</div>
<div>
<f.input
@type="number"
@name="floatStep"
@label={{t "caluma.form-builder.question.step"}}
step="any"
/>
</div>
</div>
{{/if}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export default class CfbFormEditorQuestion extends Component {
integerMaxValue: null,
floatMinValue: null,
floatMaxValue: null,
floatStep: null,
minLength: null,
maxLength: null,
defaultAnswer: null,
Expand Down Expand Up @@ -253,6 +254,7 @@ export default class CfbFormEditorQuestion extends Component {
return {
minValue: parseFloat(changeset.get("floatMinValue")),
maxValue: parseFloat(changeset.get("floatMaxValue")),
step: parseFloat(changeset.get("floatStep")),
placeholder: changeset.get("placeholder"),
hintText: changeset.get("hintText"),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ mutation SaveFloatQuestion($input: SaveFloatQuestionInput!) {
... on FloatQuestion {
floatMinValue: minValue
floatMaxValue: maxValue
floatStep: step
hintText
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ query FormEditorQuestion($slug: String!) {
... on FloatQuestion {
floatMaxValue: maxValue
floatMinValue: minValue
floatStep: step
placeholder
hintText
defaultAnswer {
Expand Down
4 changes: 4 additions & 0 deletions packages/form-builder/addon/validations/question.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ export default {
validateGtLt({ gt: "floatMinValue", allowNone: true }),
),
),
floatStep: or(
validateType("FloatQuestion", false),
validateNumber({ gt: 0, allowBlank: true }),
),

minLength: or(
and(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ module("Integration | Component | cfb-form-editor/question", function (hooks) {
});

test("it can create a float question", async function (assert) {
assert.expect(7);
assert.expect(8);

this.server.create("form", { slug: "test-form" });

Expand All @@ -313,6 +313,7 @@ module("Integration | Component | cfb-form-editor/question", function (hooks) {
assert.strictEqual(question.slug, "slug");
assert.strictEqual(question.floatMinValue, -20);
assert.strictEqual(question.floatMaxValue, 20);
assert.strictEqual(question.floatStep, 0.5);

assert.step("after-submit");
});
Expand All @@ -330,6 +331,7 @@ module("Integration | Component | cfb-form-editor/question", function (hooks) {
await fillIn("[name=slug]", "slug");
await fillIn("[name=floatMinValue]", -20);
await fillIn("[name=floatMaxValue]", 20);
await fillIn("[name=floatStep]", 0.5);

await click("button[type=submit]");

Expand Down
1 change: 1 addition & 0 deletions packages/form-builder/translations/de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ caluma:
max-value: "Maximaler Wert"
min-length: "Minimale Länge"
max-length: "Maximale Länge"
step: "Schritte"
rowForm: "Formular für Tabelleneinträge"
subForm: "Formular für Einträge"
no-selection: "Keine Auswahl"
Expand Down
1 change: 1 addition & 0 deletions packages/form-builder/translations/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ caluma:
max-value: "Maximum value"
min-length: "Minimum length"
max-length: "Maximum length"
step: "Steps"
rowForm: "Form to use for rows"
subForm: "Form to use for entries"
no-selection: "No selection"
Expand Down
1 change: 1 addition & 0 deletions packages/form-builder/translations/fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ caluma:
max-value: "Valeur maximale"
min-length: "Longueur minimale"
max-length: "Longueur maximale"
step: "Étapes"
rowForm: "Formulaire pour les entrées de tableau"
subForm: "Formulaire pour les entrées"
no-selection: "Aucune sélection"
Expand Down
1 change: 1 addition & 0 deletions packages/form-builder/translations/it.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ caluma:
max-value: "Valore massimo"
min-length: "Lunghezza minima"
max-length: "Lunghezza massima"
step: "Passi"
rowForm: "Modulo per righe delle tabelle"
subForm: "Modulo per voci"
no-selection: "Nessuna selezione"
Expand Down
2 changes: 1 addition & 1 deletion packages/form/addon/components/cf-field/input/float.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<input
type="number"
step="0.001"
step={{this.floatStep}}
class="uk-input
{{if @field.isInvalid 'uk-form-danger'}}
{{if this.disabled 'uk-disabled'}}"
Expand Down
11 changes: 11 additions & 0 deletions packages/form/addon/components/cf-field/input/float.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { getOwner } from "@ember/application";
import { action } from "@ember/object";
import Component from "@glimmer/component";

Expand All @@ -6,6 +7,16 @@ export default class CfFieldInputFloatComponent extends Component {
return this.args.disabled || this.args.field?.question.isCalculated;
}

get floatStep() {
if (this.args.field?.question?.raw?.floatStep) {
return this.args.field.question.raw.floatStep;
}

const config = getOwner(this).resolveRegistration("config:environment");
const { floatStep = 0.001 } = config["ember-caluma"] || {};
return floatStep;
}

/**
* Trigger save on input
*
Expand Down
1 change: 1 addition & 0 deletions packages/form/addon/gql/fragments/field.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ fragment SimpleQuestion on Question {
... on FloatQuestion {
floatMinValue: minValue
floatMaxValue: maxValue
floatStep: step
floatDefaultAnswer: defaultAnswer {
id
value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module("Integration | Component | cf-field/input/float", function (hooks) {
isCalculated: false,
floatMinValue: 0.4,
floatMaxValue: 1.4,
floatStep: 0.001,
},
},
});
Expand Down
2 changes: 2 additions & 0 deletions packages/testing/addon/mirage-graphql/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -1559,6 +1559,7 @@ type FloatQuestion implements Question & Node {
id: ID!
minValue: Float
maxValue: Float
step: Float
}

type Flow implements Node {
Expand Down Expand Up @@ -3153,6 +3154,7 @@ input SaveFloatQuestionInput {
isArchived: Boolean
minValue: Float
maxValue: Float
step: Float
placeholder: String
hintText: String
clientMutationId: String
Expand Down
Loading