From a50a4a2d705cdd3e7dce20045899fee4f01c4e96 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Sat, 27 Nov 2021 23:12:34 +0200
Subject: [PATCH] use monaco editor from node modules

---
 angular.json                                       |  5 +++++
 apps/red-ui/src/app/app.module.ts                  |  6 +-----
 .../file-workload/file-workload.component.ts       | 14 ++++++++++----
 libs/common-ui                                     |  2 +-
 package.json                                       |  1 +
 yarn.lock                                          |  5 +++++
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/angular.json b/angular.json
index 6706ca3d2..086ad79ec 100644
--- a/angular.json
+++ b/angular.json
@@ -117,6 +117,11 @@
                 "input": "libs/common-ui/src/assets/",
                 "output": "/assets/"
               },
+              {
+                "glob": "**/*",
+                "input": "node_modules/monaco-editor",
+                "output": "/assets/monaco-editor/"
+              },
               "apps/red-ui/src/manifest.webmanifest"
             ],
             "styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common-styles.scss"],
diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts
index 241a83554..051abb04e 100644
--- a/apps/red-ui/src/app/app.module.ts
+++ b/apps/red-ui/src/app/app.module.ts
@@ -22,7 +22,7 @@ import { SharedModule } from '@shared/shared.module';
 import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module';
 import { PlatformLocation } from '@angular/common';
 import { BASE_HREF } from './tokens';
-import { MONACO_PATH, MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
+import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
 import { GlobalErrorHandler } from '@utils/global-error-handler.service';
 import { REDMissingTranslationHandler } from '@utils/missing-translations-handler';
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler';
@@ -122,10 +122,6 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp
             useFactory: configurationInitializer,
             deps: [KeycloakService, Title, ConfigService, GeneralSettingsService],
         },
-        {
-            provide: MONACO_PATH,
-            useValue: 'https://unpkg.com/monaco-editor@0.24.0/min/vs',
-        },
         {
             provide: MissingTranslationHandler,
             useClass: REDMissingTranslationHandler,
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts
index 507f275d1..f6b6b8f96 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts
@@ -102,15 +102,21 @@ export class FileWorkloadComponent {
 
     private get _multiSelectInactive$() {
         return this.multiSelectService.inactive$.pipe(
-            tap(() => this.selectAnnotations.emit()),
+            tap(value => {
+                if (value) {
+                    this.selectAnnotations.emit();
+                }
+            }),
             shareDistinctLast(),
         );
     }
 
     private get _multiSelectActive$() {
-        const disableDeselectOnPageChange = () => {
-            this.shouldDeselectAnnotationsOnPageChange = false;
-            this.shouldDeselectAnnotationsOnPageChangeChange.emit(false);
+        const disableDeselectOnPageChange = (value: boolean) => {
+            if (value) {
+                this.shouldDeselectAnnotationsOnPageChange = false;
+                this.shouldDeselectAnnotationsOnPageChangeChange.emit(false);
+            }
         };
         return this.multiSelectService.active$.pipe(tap(disableDeselectOnPageChange), shareDistinctLast());
     }
diff --git a/libs/common-ui b/libs/common-ui
index c8d50f0ef..d58cfd543 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit c8d50f0ef9652ac74fe3e87e1a2c303cde58af04
+Subproject commit d58cfd543ba2fcd16cc09012c579a73ccbf8cc60
diff --git a/package.json b/package.json
index d9a4cc807..974e35ca1 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "lodash.orderby": "^4.6.0",
     "messageformat": "^2.3.0",
     "moment": "^2.29.1",
+    "monaco-editor": "^0.30.1",
     "ngx-color-picker": "^11.0.0",
     "ngx-toastr": "^14.1.3",
     "ngx-translate-messageformat-compiler": "^4.10.0",
diff --git a/yarn.lock b/yarn.lock
index a41ce5f58..473455631 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10394,6 +10394,11 @@ moment@^2.29.1:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
 
+monaco-editor@^0.30.1:
+  version "0.30.1"
+  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.30.1.tgz#47f8d18a0aa2264fc5654581741ab8d7bec01689"
+  integrity sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"