@projectcaluma/ember-form 14.8.2 → 14.9.0

package/app/styles/_cf-content-compare.scss

@@ -0,0 +1,214 @@
+@use "sass:color";
+
+$diff-danger-background: color.adjust(
+  $global-danger-background,
+  $lightness: 25%
+);
+$diff-success-background: color.adjust(
+  $global-success-background,
+  $lightness: 30%
+);
+$diff-warning-background: color.adjust(
+  $global-warning-background,
+  $lightness: 25%
+);
+
+.cf-compare {
+  position: relative;
+
+  &:not(.cf-compare-manual) > ::before {
+    content: "";
+    position: absolute;
+    inset: 0 auto calc($global-small-margin * -1)
+      calc($global-small-margin * -1);
+    pointer-events: none;
+    z-index: 1;
+    border-right: 2px dotted $global-primary-background;
+  }
+
+  // Default from/to version styling.
+  :not(.cf-compare-removed),
+  :not(.cf-compare-added) {
+    .uk-input {
+      overflow: visible;
+      text-wrap: wrap;
+      height: auto;
+    }
+
+    .diff-from-version {
+      background: $diff-danger-background;
+    }
+
+    .diff-to-version {
+      background: $diff-success-background;
+    }
+
+    .diff-is-added {
+      background: $diff-success-background;
+    }
+
+    .diff-is-modified {
+      background: $diff-warning-background;
+    }
+
+    .diff-is-removed {
+      background: $diff-danger-background;
+    }
+  }
+
+  // Specific styling for ember basic dropdowns.
+  &.cf-compare-ChoiceQuestion,
+  &.cf-compare-MultipleChoiceQuestion,
+  &.cf-compare-DynamicChoiceQuestion {
+    .from-version .ember-basic-dropdown-trigger {
+      background: $diff-danger-background;
+    }
+
+    .to-version .ember-basic-dropdown-trigger {
+      background: $diff-success-background;
+    }
+  }
+
+  // Specific styling for table questions.
+  &.cf-compare-TableQuestion {
+    .diff-removed {
+      background: $diff-danger-background;
+    }
+
+    .diff-modified {
+      background: $diff-warning-background;
+    }
+
+    .diff-added {
+      background: $diff-success-background;
+    }
+  }
+
+  // Overrides for added documents.
+  &.cf-compare-added {
+    .diff-from-version {
+      display: none;
+    }
+
+    .diff-to-version {
+      background: $diff-success-background;
+    }
+
+    &.cf-compare-TextQuestion,
+    &.cf-compare-DateQuestion,
+    &.cf-compare-IntegerQuestion,
+    &.cf-compare-FloatQuestion,
+    &.cf-compare-CalculatedFloatQuestion {
+      .from-version input {
+        display: none;
+      }
+
+      .to-version input {
+        background: $diff-success-background;
+      }
+    }
+
+    &.cf-compare-TextareaQuestion {
+      .from-version {
+        display: none;
+      }
+
+      .to-version {
+        background: $diff-success-background;
+      }
+    }
+
+    &.cf-compare-ChoiceQuestion,
+    &.cf-compare-MultipleChoiceQuestion,
+    &.cf-compare-DynamicChoiceQuestion {
+      .from-version .ember-basic-dropdown-trigger {
+        display: none;
+      }
+
+      .to-version .ember-basic-dropdown-trigger {
+        background: $diff-success-background;
+      }
+    }
+  }
+
+  // Overrides for removed documents.
+  &.cf-compare-removed {
+    .diff-from-version {
+      display: none;
+    }
+
+    .diff-to-version {
+      background: $diff-danger-background;
+    }
+
+    &.cf-compare-TextQuestion,
+    &.cf-compare-DateQuestion,
+    &.cf-compare-IntegerQuestion,
+    &.cf-compare-FloatQuestion,
+    &.cf-compare-CalculatedFloatQuestion {
+      .from-version input {
+        background: $diff-danger-background;
+      }
+
+      .to-version input {
+        display: none;
+      }
+    }
+
+    &.cf-compare-TextareaQuestion {
+      .from-version {
+        background: $diff-danger-background;
+      }
+
+      .to-version {
+        display: none;
+      }
+    }
+
+    &.cf-compare-ChoiceQuestion,
+    &.cf-compare-MultipleChoiceQuestion,
+    &.cf-compare-DynamicChoiceQuestion {
+      .from-version .ember-basic-dropdown-trigger {
+        display: none;
+      }
+
+      .to-version .ember-basic-dropdown-trigger {
+        background: $diff-danger-background;
+      }
+    }
+  }
+
+  // Extra specific styling for textarea questions.
+  &.cf-compare-TextareaQuestion .uk-form-controls {
+    .uk-textarea {
+      padding: 0;
+      height: auto;
+    }
+
+    .diff-from-version,
+    .diff-to-version {
+      white-space: pre-line;
+      padding: 2px 4px;
+      min-height: $global-medium-font-size;
+    }
+  }
+
+  // Extra specific styling for choice questions.
+  &.cf-compare-ChoiceQuestion .uk-form-controls,
+  &.cf-compare-MultipleChoiceQuestion .uk-form-controls {
+    label {
+      display: block;
+      padding: 4px;
+      line-height: 1rem;
+
+      input {
+        margin: 0;
+        padding: 0;
+      }
+    }
+
+    br {
+      display: none;
+    }
+  }
+}

package/app/styles/_cf-navigation.scss

@@ -51,6 +51,7 @@ $icon-size: 0.8rem !default;
   }
 }
 
+.cf-navigation__item__icon--compare-modified,
 .cf-navigation__item__icon--in-progress.cf-navigation__item__icon--dirty {
   color: color.adjust($global-warning-background, $lightness: -20%);
   border-color: color.adjust($global-warning-background, $lightness: 10%);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "14.8.2",
+  "version": "14.9.0",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -14,7 +14,6 @@
     "@ember/test-waiters": "^4.1.1",
     "@embroider/macros": "^1.16.10",
     "@embroider/util": "^1.13.2",
-    "dompurify": "^3.3.1",
     "ember-apollo-client": "^5.0.0",
     "ember-auto-import": "^2.10.0",
     "ember-autoresize-modifier": "^0.7.0 || ^0.8.0",
@@ -40,7 +39,7 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.8.2"
+    "@projectcaluma/ember-core": "^14.9.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.3.0",
@@ -75,12 +74,12 @@
     "uikit": "3.25.6",
     "uuid": "13.0.0",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.8.2",
-    "@projectcaluma/ember-workflow": "14.8.2"
+    "@projectcaluma/ember-testing": "14.9.0",
+    "@projectcaluma/ember-workflow": "14.9.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0",
-    "@projectcaluma/ember-workflow": "^14.8.2"
+    "@projectcaluma/ember-workflow": "^14.9.0"
   },
   "dependenciesMeta": {
     "@projectcaluma/ember-core": {

package/translations/de.yaml

@@ -57,3 +57,12 @@ caluma:
       format: "{errorMsg}"
       table: "Mindestens eine Zeile der Tabelle wurde nicht korrekt ausgefüllt"
       error: "Folgende Fragen sind noch nicht korrekt ausgefüllt:"
+
+    compare:
+      note: "Geändert von {username} am {date}"
+      diff:
+        added: "Hinzugefügt"
+        removed: "Entfernt"
+        modified: "Geändert"
+      timeline:
+        current: "Aktueller Formularstand"

package/translations/en.yaml

@@ -57,3 +57,12 @@ caluma:
       format: "{errorMsg}"
       table: "At least one row of the table was not filled in correctly"
       error: "The following questions have not yet been filled in correctly:"
+
+    compare:
+      note: "Changed by {username} on {date}"
+      diff:
+        added: "Added"
+        removed: "Removed"
+        modified: "Modified"
+      timeline:
+        current: "Current form version"

package/translations/fr.yaml

@@ -57,3 +57,12 @@ caluma:
       format: "{errorMsg}"
       table: "Au moins une ligne du tableau n'a pas été remplie correctement"
       error: "Les questions suivantes n'ont pas encore été correctement remplies :"
+
+    compare:
+      note: "Modifié par {username} le {date}"
+      diff:
+        added: "Ajouté"
+        removed: "Supprimé"
+        modified: "Modifié"
+      timeline:
+        current: "Version actuelle du formulaire"

package/translations/it.yaml

@@ -57,3 +57,12 @@ caluma:
       format: "{errorMsg}"
       table: "Almeno una riga della tabella non è stata compilata correttamente."
       error: "Le domande seguenti non sono state compilate in modo corretto:"
+
+    compare:
+      note: "Modificato da {username} il {date}"
+      diff:
+        added: "Aggiunto"
+        removed: "Rimosso"
+        modified: "Modificato"
+      timeline:
+        current: "Versione attuale del modulo"

package/addon/initializers/register-showdown-extensions.js

@@ -1,20 +0,0 @@
-import DOMPurify from "dompurify";
-import showdown from "showdown";
-
-export function initialize() {
-  showdown.extension("DOMPurify", function () {
-    return [
-      {
-        type: "output",
-        filter(dirty) {
-          return DOMPurify.sanitize(dirty, { USE_PROFILES: { html: true } });
-        },
-      },
-    ];
-  });
-}
-
-export default {
-  name: "register-showdown-extensions",
-  initialize,
-};

package/app/initializers/register-showdown-extensions.js

@@ -1,4 +0,0 @@
-export {
-  default,
-  initialize,
-} from "@projectcaluma/ember-form/initializers/register-showdown-extensions";