@projectcaluma/ember-analytics 11.0.0-beta.39 → 11.0.0

package/addon/components/ca-field-selector-list.hbs

@@ -1,6 +1,11 @@
-<table class="uk-table uk-table-divider uk-table-hover" uk-overflow-auto>
+<table
+  class="uk-table uk-table-divider uk-table-hover"
+  uk-overflow-auto
+  {{did-insert this.setupUIkit}}
+>
   <thead>
     <tr>
+      <th></th>
       <th>{{t "caluma.analytics.edit.question"}}</th>
       <th>{{t "caluma.analytics.edit.display-title"}}</th>
       <th>{{t "caluma.analytics.edit.aggregation"}}</th>
@@ -11,10 +16,23 @@
       <th></th>
     </tr>
   </thead>
-  <tbody>
+  <tbody
+    data-test-field-list
+    uk-sortable="handle: .uk-sortable-handle;"
+    class="uk-list"
+    id="field-list"
+  >
     {{#each this.fields as |field|}}
       {{#let (fn this.updateField field) as |update|}}
-        <tr>
+        <tr id={{field.id}}>
+          <td>
+            <span
+              data-test-sort-handle
+              uk-icon="menu"
+              class="uk-sortable-handle"
+              role="button"
+            ></span>
+          </td>
           <td>
             {{field.dataSource}}
           </td>
@@ -71,7 +89,7 @@
         </tr>
       {{/let}}
     {{else}}
-      <td colspan="5">
+      <td colspan="7">
         <h3 class="uk-flex uk-flex-center uk-flex-middle">
           <UkIcon @icon="search" @ratio="1.5" class="uk-margin-small-right" />
           {{t "caluma.analytics.edit.empty"}}

package/addon/components/ca-field-selector-list.js

@@ -1,10 +1,13 @@
 import { action } from "@ember/object";
+import { run } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager, getObservable } from "ember-apollo-client";
-import { enqueueTask } from "ember-concurrency";
+import { enqueueTask, restartableTask } from "ember-concurrency";
+import UIkit from "uikit";
 
 import removeAnalyticsFieldMutation from "@projectcaluma/ember-analytics/gql/mutations/remove-analytics-field.graphql";
+import reorderAnalyticsFieldsMutation from "@projectcaluma/ember-analytics/gql/mutations/reorder-analytics-fields.graphql";
 import saveAnalyticsField from "@projectcaluma/ember-analytics/tasks/save-analytics-field";
 
 export default class CaFieldSelectorListComponent extends Component {
@@ -51,4 +54,40 @@ export default class CaFieldSelectorListComponent extends Component {
       );
     }
   }
+
+  @restartableTask
+  *reorderFields(fields) {
+    try {
+      yield this.apollo.mutate({
+        mutation: reorderAnalyticsFieldsMutation,
+        variables: {
+          input: {
+            table: this.args.analyticsTable.id,
+            fields,
+          },
+        },
+      });
+
+      this.notification.success(
+        this.intl.t("caluma.analytics.notification.reorder-success")
+      );
+    } catch (e) {
+      this.notification.danger(
+        this.intl.t("caluma.analytics.notification.reorder-error")
+      );
+    }
+  }
+
+  _handleMoved({ detail: [sortable] }) {
+    const options = [...sortable.$el.children];
+
+    this.reorderFields.perform(options.map((option) => option.id));
+  }
+
+  @action
+  setupUIkit() {
+    UIkit.util.on("#field-list", "moved", (...args) =>
+      run(this, this._handleMoved, ...args)
+    );
+  }
 }

package/addon/gql/mutations/reorder-analytics-fields.graphql

@@ -0,0 +1,5 @@
+mutation ReorderAnalyticsFields($input: ReorderAnalyticsFieldsInput!) {
+  reorderAnalyticsFields(input: $input) {
+    clientMutationId
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-analytics",
-  "version": "11.0.0-beta.39",
+  "version": "11.0.0",
   "description": "Ember addon for Caluma analytics.",
   "keywords": [
     "ember-addon",
@@ -10,7 +10,7 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "scripts": {
-    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
@@ -18,20 +18,20 @@
     "@ember/legacy-built-in-components": "^0.4.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.39",
+    "@projectcaluma/ember-core": "^11.0.0",
     "ember-apollo-client": "^4.0.2",
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.6.0",
     "ember-changeset": "^4.1.2",
     "ember-changeset-validations": "^4.1.1",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.1.1",
+    "ember-cli-htmlbars": "^6.2.0",
     "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^2.3.7",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.2",
     "ember-intl": "^5.7.0",
     "ember-power-select": "6.0.1",
-    "ember-resources": "^5.6.0",
+    "ember-resources": "^5.6.2",
     "ember-uikit": "^6.1.1",
     "ember-validated-form": "^6.1.2",
     "graphql": "^15.6.1"
@@ -45,12 +45,13 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.7.0",
-    "@embroider/test-setup": "2.0.0",
+    "@embroider/test-setup": "2.1.1",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.39",
+    "@projectcaluma/ember-testing": "11.0.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "4.8.0",
-    "ember-cli-code-coverage": "1.0.3",
+    "concurrently": "7.6.0",
+    "ember-cli": "4.9.2",
+    "ember-cli-code-coverage": "2.0.0",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
     "ember-cli-mirage": "3.0.0-alpha.3",
@@ -58,24 +59,25 @@
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-data": "4.7.3",
-    "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.9.0",
+    "ember-engines": "0.8.23",
     "ember-load-initializers": "2.1.2",
-    "ember-qunit": "6.0.0",
-    "ember-resolver": "8.0.3",
-    "ember-source": "4.8.2",
+    "ember-qunit": "6.1.1",
+    "ember-resolver": "8.1.0",
+    "ember-source": "4.10.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "npm-run-all": "4.1.5",
-    "qunit": "2.19.3",
+    "qunit": "2.19.4",
     "qunit-dom": "2.0.0",
-    "sass": "1.56.1",
+    "sass": "1.57.1",
     "webpack": "5.75.0"
   },
   "peerDependency": {
     "ember-engines": ">= 0.8"
   },
+  "peerDependencies": {
+    "ember-source": "^3.28.0 || ^4.0.0"
+  },
   "engines": {
     "node": "14.* || 16.* || >= 18"
   },

package/translations/de.yaml

@@ -16,6 +16,8 @@ caluma:
       fetch-error: Beim Laden der Daten ist ein Fehler aufgetreten.
       filter-exists: Filter existiert bereits!!
       field-saved: Feld gespeichert.
+      reorder-success: Felder wurden erfolgreich sortiert!
+      reorder-error: Beim Sortieren der Felder ist etwas schief gelaufen.
     list:
       list-title: Liste aller Auswertungen
       edit: Bearbeiten

package/translations/en.yaml

@@ -16,6 +16,8 @@ caluma:
       fetch-error: An error occurred while loading the data.
       filter-exists: Filter already exists!
       field-saved: Field successfully saved.
+      reorder-success: Fields were successfully reordered!
+      reorder-error: Something went wrong while reordering the fields.
     list:
       list-title: All reports
       edit: Edit

package/translations/fr.yaml

@@ -16,6 +16,8 @@ caluma:
       fetch-error: "Une erreur s'est produite lors du chargement des données."
       filter-exists: "Le filtre existe déjà!"
       field-saved: Le champ a été sauvegardé avec succès.
+      reorder-success: Vos entrées ont été triées avec succès!
+      reorder-error: Quelque chose s'est mal passé lors du tri des entrées.
     list:
       list-title: Tous les rapports
       edit: Editer