@projectcaluma/ember-form-builder 12.11.1 → 12.13.0

package/addon/components/cfb-form-editor/cfb-advanced-settings.hbs

@@ -1,6 +1,6 @@
 <UkButton
   @color="link"
-  @onClick={{toggle-action "showAdvanced" this}}
+  @onClick={{this.toggleAdvanced}}
   class="uk-flex uk-flex-middle uk-margin"
 >
   {{#if this.showAdvanced}}

package/addon/components/cfb-form-editor/cfb-advanced-settings.js

@@ -1,6 +1,20 @@
+import { action } from "@ember/object";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
-
 export default class CfbFormEditorCfbAdvancedSettings extends Component {
   @tracked showAdvanced = false;
+
+  constructor(owner, args) {
+    super(owner, args);
+
+    this.showAdvanced =
+      JSON.parse(localStorage.getItem("showAdvanced")) ?? false;
+  }
+
+  @action
+  toggleAdvanced() {
+    this.showAdvanced = !this.showAdvanced;
+
+    localStorage.setItem("showAdvanced", this.showAdvanced);
+  }
 }

package/addon/components/cfb-form-editor/question-list/item.hbs

@@ -41,7 +41,11 @@
       <a
         data-test-edit-question
         href="#"
-        class="uk-width-auto uk-margin-small-right uk-text-bold"
+        class={{if
+          this.isActive
+          "uk-width-auto uk-margin-small-right uk-text-bold"
+          "uk-width-auto uk-margin-small-right"
+        }}
         {{on "click" (fn this.editQuestion @question)}}
       >
         {{@question.slug}}
@@ -51,7 +55,11 @@
       </a>
     {{else}}
       <span
-        class="uk-width-auto uk-margin-small-right uk-text-bold"
+        class={{if
+          this.isActive
+          "uk-width-auto uk-margin-small-right uk-text-bold"
+          "uk-width-auto uk-margin-small-right"
+        }}
       >{{@question.slug}}</span>
     {{/if}}
 

package/addon/components/cfb-form-editor/question-list/item.js

@@ -1,11 +1,14 @@
 import { action } from "@ember/object";
 import { guidFor } from "@ember/object/internals";
+import { service } from "@ember/service";
 import Component from "@glimmer/component";
 import jexl from "jexl";
 
 import { hasQuestionType } from "@projectcaluma/ember-core/helpers/has-question-type";
 
 export default class CfbFormEditorQuestionListItem extends Component {
+  @service router;
+
   get elementId() {
     return guidFor(this);
   }
@@ -48,6 +51,14 @@ export default class CfbFormEditorQuestionListItem extends Component {
     );
   }
 
+  get isActive() {
+    // we can't access this.router.applicationRouter.currentRoute.queryParams
+    // because it is non-reactive
+    return this.router.currentURL?.endsWith(
+      `/questions/${this.args.question.slug}`,
+    );
+  }
+
   @action
   editQuestion(question, e) {
     e.preventDefault();

package/addon/components/cfb-form-editor/question.hbs

@@ -428,10 +428,12 @@
       </CfbFormEditor::CfbAdvancedSettings>
 
       <div class="uk-flex uk-flex-between uk-flex-middle uk-flex-row-reverse">
-        <CfbFormEditor::QuestionUsage
-          @slug={{changeset-get f.model "slug"}}
-          class="uk-flex-last"
-        />
+        {{#unless this.isNew}}
+          <CfbFormEditor::QuestionUsage
+            @slug={{changeset-get f.model "slug"}}
+            class="uk-flex-last"
+          />
+        {{/unless}}
 
         <f.submit
           @disabled={{f.loading}}

package/addon/components/cfb-form-editor/question.js

@@ -195,6 +195,10 @@ export default class CfbFormEditorQuestion extends Component {
     return this.data.lastSuccessful?.value?.[0]?.node;
   }
 
+  get isNew() {
+    return !this.changeset.get("id");
+  }
+
   get prefix() {
     return this.calumaOptions.namespace
       ? `${this.calumaOptions.namespace}-`

package/addon/templates/edit/questions/edit.hbs

@@ -1,5 +1,4 @@
 <CfbFormEditor::Question
   @slug={{@model.questionSlug}}
   @form={{@model.formSlug}}
-  @onAfterSubmit={{this.afterSubmit}}
 />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "12.11.1",
+  "version": "12.13.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -44,8 +44,8 @@
     "lodash.isequal": "^4.5.0",
     "reactiveweb": "^1.2.2",
     "uikit": "^3.19.2",
-    "@projectcaluma/ember-core": "^12.11.1",
-    "@projectcaluma/ember-form": "^12.11.1"
+    "@projectcaluma/ember-core": "^12.13.0",
+    "@projectcaluma/ember-form": "^12.13.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -81,7 +81,7 @@
     "qunit": "2.20.1",
     "qunit-dom": "3.0.0",
     "webpack": "5.91.0",
-    "@projectcaluma/ember-testing": "12.11.1"
+    "@projectcaluma/ember-testing": "12.13.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.9.0",

package/addon/controllers/edit/questions/edit.js

@@ -1,12 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-
-export default class EditQuestionsEditController extends Controller {
-  @service router;
-
-  @action
-  afterSubmit() {
-    this.router.transitionTo("edit");
-  }
-}