Skip to content

Commit

Permalink
fix(form builder): fix handling of existing metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
@anehx
Jonas Metzener authored and anehx committed May 22, 2019
1 parent 480b67b commit 4d9071f
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 54 deletions.
82 changes: 28 additions & 54 deletions addon/components/cfb-form-editor/question.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { task, timeout } from "ember-concurrency";
import { ComponentQueryManager } from "ember-apollo-client";
import v4 from "uuid/v4";
import { optional } from "ember-composable-helpers/helpers/optional";
import { computed, getWithDefault } from "@ember/object";
import { computed, getWithDefault, get } from "@ember/object";
import slugify from "ember-caluma/utils/slugify";
import { A } from "@ember/array";
import validations from "ember-caluma/validations/question";
Expand Down Expand Up @@ -105,22 +105,14 @@ export default Component.extend(ComponentQueryManager, {
]);
}

const questions = yield this.get("apollo").watchQuery(
return yield this.get("apollo").watchQuery(
{
query: formEditorQuestionQuery,
variables: { slug: this.get("slug") },
fetchPolicy: "cache-and-network"
},
"allQuestions.edges"
);

return A(
questions.map(question => {
question.node.widgetOverride =
question.node.meta.widgetOverride || null;
return question;
})
);
}).restartable(),

availableForms: task(function*() {
Expand Down Expand Up @@ -167,22 +159,20 @@ export default Component.extend(ComponentQueryManager, {

model: computed("data.lastSuccessful.value.firstObject.node", function() {
const model = this.get("data.lastSuccessful.value.firstObject.node");
// flatten attributes until nested property support landed in ember-validated-form
if (model && model.rowForm) {
model.rowsToDisplay = model.rowForm.questions.edges.map(n => n.node);
model.rowForm = model.rowForm.slug;
model.selectedColumnsToDisplay = [];
if (model.meta && model.meta.columnsToDisplay) {
model.selectedColumnsToDisplay = model.meta.columnsToDisplay;
}
}
if (model && model.subForm) {
model.subForm = model.subForm.slug;
}
if (model && model.meta && model.meta.hideLabel) {
model.hideLabel = model.meta.hideLabel;
}
return model;

return (
model &&
Object.assign(model, {
subForm: get(model, "subForm.slug"),
rowForm: get(model, "rowForm.slug"),
rowsToDisplay: getWithDefault(model, "rowForm.questions.edges", []).map(
({ node }) => node
),
selectedColumnsToDisplay: get(model, "meta.columnsToDisplay"),
hideLabel: get(model, "meta.hideLabel"),
widgetOverride: get(model, "meta.widgetOverride")
})
);
}),

changeset: computed("model", function() {
Expand Down Expand Up @@ -241,55 +231,35 @@ export default Component.extend(ComponentQueryManager, {
_getMultipleChoiceQuestionInput(changeset) {
return {
isRequired: changeset.get("isRequired"),
options: changeset.get("options.edges").map(({ node: { slug } }) => slug),
meta: JSON.stringify({
widgetOverride: changeset.get("widgetOverride"),
hideLabel: changeset.get("hideLabel")
})
options: changeset.get("options.edges").map(({ node: { slug } }) => slug)
};
},

_getChoiceQuestionInput(changeset) {
return {
isRequired: changeset.get("isRequired"),
options: changeset.get("options.edges").map(({ node: { slug } }) => slug),
meta: JSON.stringify({
widgetOverride: changeset.get("widgetOverride"),
hideLabel: changeset.get("hideLabel")
})
options: changeset.get("options.edges").map(({ node: { slug } }) => slug)
};
},

_getDynamicMultipleChoiceQuestionInput(changeset) {
return {
isRequired: changeset.get("isRequired"),
dataSource: changeset.get("dataSource"),
meta: JSON.stringify({
widgetOverride: changeset.get("widgetOverride"),
hideLabel: changeset.get("hideLabel")
})
dataSource: changeset.get("dataSource")
};
},

_getDynamicChoiceQuestionInput(changeset) {
return {
isRequired: changeset.get("isRequired"),
dataSource: changeset.get("dataSource"),
meta: JSON.stringify({
widgetOverride: changeset.get("widgetOverride"),
hideLabel: changeset.get("hideLabel")
})
dataSource: changeset.get("dataSource")
};
},

_getTableQuestionInput(changeset) {
return {
isRequired: changeset.get("isRequired"),
rowForm: changeset.get("rowForm"),
meta: JSON.stringify({
widgetOverride: changeset.get("widgetOverride"),
columnsToDisplay: this.get("model.selectedColumnsToDisplay")
})
rowForm: changeset.get("rowForm")
};
},

Expand Down Expand Up @@ -350,9 +320,13 @@ export default Component.extend(ComponentQueryManager, {
slug,
isHidden: changeset.get("isHidden"),
infoText: changeset.get("infoText"),
meta: JSON.stringify({
widgetOverride: changeset.get("widgetOverride")
}),
meta: JSON.stringify(
Object.assign({}, changeset.get("data.meta"), {
hideLabel: changeset.get("hideLabel"),
widgetOverride: changeset.get("widgetOverride"),
columnsToDisplay: changeset.get("selectedColumnsToDisplay")
})
),
isArchived: changeset.get("isArchived"),
clientMutationId: v4()
},
Expand Down
29 changes: 29 additions & 0 deletions tests/integration/components/cfb-form-editor/question-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,35 @@ module("Integration | Component | cfb-form-editor/question", function(hooks) {
assert.verifySteps(["after-submit"]);
});

test("it respects existing metadata", async function(assert) {
assert.expect(4);

this.server.create("question", {
label: "Test Label",
slug: "test-slug",
type: "TEXT",
meta: { someMetaKey: "foobar" }
});

this.server.logging = true;

this.set("afterSubmit", question => {
assert.ok(question);
assert.equal(question.meta.someMetaKey, "foobar");
assert.step("after-submit");
});

await render(
hbs`{{cfb-form-editor/question slug='test-slug' on-after-submit=(action afterSubmit)}}`
);

await fillIn("[name=label]", "Test Label 1");

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

assert.verifySteps(["after-submit"]);
});

test("it can handle errors", async function(assert) {
assert.expect(1);

Expand Down

0 comments on commit 4d9071f

Please sign in to comment.