Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

use monaco editor from node modules

Browse Source
This commit is contained in:
Dan Percic 2021-11-27 23:12:34 +02:00
parent 41e1ce5b1d
commit a50a4a2d70
6 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
angular.json
View File

@ -117,6 +117,11 @@
"input": "libs/common-ui/src/assets/", "input": "libs/common-ui/src/assets/",
"output": "/assets/" "output": "/assets/"
}, },
{
"glob": "**/*",
"input": "node_modules/monaco-editor",
"output": "/assets/monaco-editor/"
},
"apps/red-ui/src/manifest.webmanifest" "apps/red-ui/src/manifest.webmanifest"
], ],
"styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common-styles.scss"], "styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common-styles.scss"],

6
apps/red-ui/src/app/app.module.ts
View File

@ -22,7 +22,7 @@ import { SharedModule } from '@shared/shared.module';
import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module'; import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module';
import { PlatformLocation } from '@angular/common'; import { PlatformLocation } from '@angular/common';
import { BASE_HREF } from './tokens'; 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 { GlobalErrorHandler } from '@utils/global-error-handler.service';
import { REDMissingTranslationHandler } from '@utils/missing-translations-handler'; import { REDMissingTranslationHandler } from '@utils/missing-translations-handler';
import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'; import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler';
@ -122,10 +122,6 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp
useFactory: configurationInitializer, useFactory: configurationInitializer,
deps: [KeycloakService, Title, ConfigService, GeneralSettingsService], deps: [KeycloakService, Title, ConfigService, GeneralSettingsService],
}, },
{
provide: MONACO_PATH,
useValue: 'https://unpkg.com/monaco-editor@0.24.0/min/vs',
},
{ {
provide: MissingTranslationHandler, provide: MissingTranslationHandler,
useClass: REDMissingTranslationHandler, useClass: REDMissingTranslationHandler,

14
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.ts
View File

@ -102,15 +102,21 @@ export class FileWorkloadComponent {
private get _multiSelectInactive$() { private get _multiSelectInactive$() {
return this.multiSelectService.inactive$.pipe( return this.multiSelectService.inactive$.pipe(
tap(() => this.selectAnnotations.emit()), tap(value => {
if (value) {
this.selectAnnotations.emit();
}
}),
shareDistinctLast(), shareDistinctLast(),
); );
} }
private get _multiSelectActive$() { private get _multiSelectActive$() {
const disableDeselectOnPageChange = () => { const disableDeselectOnPageChange = (value: boolean) => {
this.shouldDeselectAnnotationsOnPageChange = false; if (value) {
this.shouldDeselectAnnotationsOnPageChangeChange.emit(false); this.shouldDeselectAnnotationsOnPageChange = false;
this.shouldDeselectAnnotationsOnPageChangeChange.emit(false);
}
}; };
return this.multiSelectService.active$.pipe(tap(disableDeselectOnPageChange), shareDistinctLast()); return this.multiSelectService.active$.pipe(tap(disableDeselectOnPageChange), shareDistinctLast());
} }

2
libs/common-ui

@ -1 +1 @@
Subproject commit c8d50f0ef9652ac74fe3e87e1a2c303cde58af04 Subproject commit d58cfd543ba2fcd16cc09012c579a73ccbf8cc60

1
package.json
View File

@ -49,6 +49,7 @@
"lodash.orderby": "^4.6.0", "lodash.orderby": "^4.6.0",
"messageformat": "^2.3.0", "messageformat": "^2.3.0",
"moment": "^2.29.1", "moment": "^2.29.1",
"monaco-editor": "^0.30.1",
"ngx-color-picker": "^11.0.0", "ngx-color-picker": "^11.0.0",
"ngx-toastr": "^14.1.3", "ngx-toastr": "^14.1.3",
"ngx-translate-messageformat-compiler": "^4.10.0", "ngx-translate-messageformat-compiler": "^4.10.0",

5
yarn.lock
View File

@ -10394,6 +10394,11 @@ moment@^2.29.1:
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== 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: move-concurrently@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"