From f4b54fa7455f1e3e80032002abb4f4da3d659586 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 4 Apr 2023 10:49:59 +0300
Subject: [PATCH] Update UIkit to 3.12.2. Add Subjects: Cliking add will add
 the input value also.

---
 package.json                                             | 4 ++--
 src/app/openaireLibrary                                  | 2 +-
 .../subjects-edit-form/subjects-edit-form.component.html | 4 ++--
 .../subjects-edit-form/subjects-edit-form.component.ts   | 9 ++++++---
 src/assets/openaire-theme                                | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 56cc303..6c7140d 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "sass-loader": "7.3.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
-    "uikit": "3.12.0",
+    "uikit": "3.12.2",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
@@ -64,4 +64,4 @@
     "ts-node": "~7.0.0",
     "typescript": "~4.6.4"
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index f1f8246..7ecb56e 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit f1f824674d1431ca1d4e6c31d720d3e36b153d1e
+Subproject commit 7ecb56ec9883e78cc6039c6094e60975176c7b57
diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html
index 1c9bbb3..803a79a 100644
--- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html
+++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html
@@ -287,7 +287,7 @@
     </ul>
     <ul class="uk-switcher">
       <li *ngIf="subjectsForm">
-        <div input [type]="'chips'" [formInput]="subjectsForm" [inputClass]="'flat small'" [extendEnter]="onEnter"
+        <div #addSubjectsInput input [type]="'chips'" [formInput]="subjectsForm" [inputClass]="'flat small'" [extendEnter]="onEnter"
           [separators]="[',', 'enter']" [visibleChips]="3" class="uk-width-1-1 uk-width-xlarge@m"
           [placeholder]="{static: true, label: 'Type subjects as free text keywords'}">
           <div tools class="uk-flex uk-flex-right">
@@ -313,4 +313,4 @@
       </li>
     </ul>
   </div>
-</fs-modal>
\ No newline at end of file
+</fs-modal>
diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts
index a9d1ffc..cf4bd6d 100644
--- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts
+++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts
@@ -16,6 +16,7 @@ import {NotificationHandler} from "../../../openaireLibrary/utils/notification-h
 import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service";
 import {SdgSelectionComponent} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.component';
 import {FosSelectionComponent} from '../../../openaireLibrary/fos/fos-selection/fos-selection.component';
+import {InputComponent} from "../../../openaireLibrary/sharedComponents/input/input.component";
 
 declare var UIkit: any;
 
@@ -55,7 +56,7 @@ export class SubjectsEditFormComponent implements OnInit {
   indexSdg: number = 0;
   indexFos: number = 0;
 
-  @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
+  @ViewChild('addSubjectsInput') addSubjectsInput: InputComponent;
   @ViewChild('editModal') editModal: AlertModal;
   @ViewChild('deleteModal') deleteModal: AlertModal;
 	@ViewChild('fsModal', {static: true}) fullscreen: FullScreenModalComponent;
@@ -274,8 +275,10 @@ export class SubjectsEditFormComponent implements OnInit {
 	}
 
 	public addSubjectsIntoList() {
-		const subjectsFromUserInput = this.subjectsForm.getRawValue();
-		subjectsFromUserInput.forEach(element => {
+		if(this.addSubjectsInput.searchControl.getRawValue()) {
+			this.addSubjectsInput.add(null, true);
+		}
+		this.subjectsForm.getRawValue().forEach(element => {
 			this.displayedSubjects.unshift(element);
 		});
 		this.subjectsForm.clear();
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index f264617..aa1e6c9 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit f264617e5ab356c4279ee1ef1819db434fec4fba
+Subproject commit aa1e6c9df390a4ba0919b5f8591374f7eec75089