From 84af5924d3b974d1f1db39c22d5d05e8d48a1629 Mon Sep 17 00:00:00 2001
From: Nikola Holst Nikolic <nikola.holst-nikolic@arbetsformedlingen.se>
Date: Tue, 26 Oct 2021 15:11:37 +0200
Subject: [PATCH] Merge pull request #220 in TEA/mina-sidor-fa-web from
 bugfix/TV-672-fe-bug-redigera-personal-vanster-ram-syns-inte-i-felmeddelanden
 to develop

Squashed commit of the following:

commit 1ca1b561648ffc272a55e82b7bb813abca9cab46
Merge: d21e7748 aac7cf6c
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Tue Oct 26 15:05:19 2021 +0200

    Merge branch 'develop' into bugfix/TV-672-fe-bug-redigera-personal-vanster-ram-syns-inte-i-felmeddelanden

commit d21e7748e7e528a4b1aa48dd5b6a2385a336a27c
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Oct 25 14:32:54 2021 +0200

    - Updated digi-core version from 9.4.0 to 10.0.0
    - Wrote over the new digi-variable to change wrap to no-wrap.
---
 .../edit-employee-form.component.html         |  1 +
 .../edit-employee-form.component.scss         |  6 +++++
 package-lock.json                             | 23 +++++++------------
 package.json                                  |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
index cacd4e9..ecd905e 100644
--- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
@@ -112,6 +112,7 @@
 
       <digi-notification-alert
         *ngIf="errorWhileUpdating"
+        class="edit-employee-form__notification-alert"
         af-variation="danger"
         af-heading="Kunde inte spara"
         af-heading-level="h4"
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss
index 1570524..4701337 100644
--- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss
+++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.scss
@@ -4,6 +4,12 @@
 @import '~@digi/core/dist/collection/components/_button/button/button.css';
 
 .edit-employee-form {
+  &__notification-alert {
+    ::ng-deep .digi-layout-media-object {
+      --digi-layout-media-object--flex-wrap: nowrap;
+    }
+  }
+
   &__contents {
     display: flex;
     flex-direction: column;
diff --git a/package-lock.json b/package-lock.json
index 76a614a..bc60d21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "@angular/platform-browser": "^11.2.0",
         "@angular/platform-browser-dynamic": "^11.2.0",
         "@angular/router": "^11.2.0",
-        "@digi/core": "^9.4.0",
+        "@digi/core": "^10.0.0",
         "@digi/styles": "^6.0.2",
         "@elastic/apm-rum-angular": "^2.1.1",
         "@nrwl/angular": "11.5.1",
@@ -3146,9 +3146,9 @@
       }
     },
     "node_modules/@digi/core": {
-      "version": "9.4.4",
-      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/core/-/core-9.4.4.tgz",
-      "integrity": "sha512-jQmaIQpEs6Z3QbqhNfzirJyVhGA8vfVAwIRKvioC/hdSW7/ikBsoiXrUBWXSygGQ17/TGH9UgvN1ucM5khbk8Q==",
+      "version": "10.0.0",
+      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/core/-/core-10.0.0.tgz",
+      "integrity": "sha512-1nWnoUhdml/g21iIowzqkCRowdzwo+H8/61qcU0cjFrRp9C1Owanr1hipNA70k4pBRw0tybls425eUWO0GTUIQ==",
       "license": "MIT"
     },
     "node_modules/@digi/styles": {
@@ -23743,11 +23743,6 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -37497,9 +37492,9 @@
       }
     },
     "@digi/core": {
-      "version": "9.4.4",
-      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/core/-/core-9.4.4.tgz",
-      "integrity": "sha512-jQmaIQpEs6Z3QbqhNfzirJyVhGA8vfVAwIRKvioC/hdSW7/ikBsoiXrUBWXSygGQ17/TGH9UgvN1ucM5khbk8Q=="
+      "version": "10.0.0",
+      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/core/-/core-10.0.0.tgz",
+      "integrity": "sha512-1nWnoUhdml/g21iIowzqkCRowdzwo+H8/61qcU0cjFrRp9C1Owanr1hipNA70k4pBRw0tybls425eUWO0GTUIQ=="
     },
     "@digi/styles": {
       "version": "6.0.2",
@@ -40484,9 +40479,7 @@
       "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/ajv-formats/-/ajv-formats-2.1.0.tgz",
       "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
       "peer": true,
-      "requires": {
-        "ajv": "^8.0.0"
-      }
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
diff --git a/package.json b/package.json
index 7b5f2cf..088cfa2 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "@angular/platform-browser": "^11.2.0",
     "@angular/platform-browser-dynamic": "^11.2.0",
     "@angular/router": "^11.2.0",
-    "@digi/core": "^9.4.0",
+    "@digi/core": "^10.0.0",
     "@digi/styles": "^6.0.2",
     "@elastic/apm-rum-angular": "^2.1.1",
     "@nrwl/angular": "11.5.1",