diff --git a/angular.json b/angular.json index 563b8117ee..27ad3d517e 100644 --- a/angular.json +++ b/angular.json @@ -108,7 +108,7 @@ }, { "glob": "**/*", - "input": "node_modules/ngx-monaco-editor/assets/monaco", + "input": "node_modules/monaco-editor", "output": "/assets/monaco/" } ], diff --git a/demo-shell/resources/i18n/ar.json b/demo-shell/resources/i18n/ar.json index 98506180d3..94279ae9ea 100755 --- a/demo-shell/resources/i18n/ar.json +++ b/demo-shell/resources/i18n/ar.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "استخدم نموذج مخصص للرأس 'المستخدم'", "CUSTOM_COLUMN_HEADER": "قالب رأس المستخدم المخصص" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "لم يتم تحديد تقرير. اختر تقريرًا من القائمة" - }, "PS-TAB": { "TASKS-TAB": "المهام", "PROCESSES-TAB": "العملية", - "REPORTS-TAB": "تقارير", "SETTINGS-TAB": "إعدادات", "START-TASK": "بدء مهمة", "START-PROCESS": "بدء العملية", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "افتراضي", "OPEN_DIALOG": "فتح الحوار", "SHOW_LIST_LABEL": "انقر لعرض القائمة" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/cs.json b/demo-shell/resources/i18n/cs.json index 734397e19d..2272777ffd 100755 --- a/demo-shell/resources/i18n/cs.json +++ b/demo-shell/resources/i18n/cs.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Použít vlastní šablonu pro záhlaví ,Uživatel‘", "CUSTOM_COLUMN_HEADER": "Vlastní šablona záhlaví Uživatel" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Nebyly zvoleny žádné zprávy. Vyberte zprávu ze seznamu" - }, "PS-TAB": { "TASKS-TAB": "Úkoly", "PROCESSES-TAB": "Proces", - "REPORTS-TAB": "Protokoly", "SETTINGS-TAB": "Nastavení", "START-TASK": "Zahájit úkol", "START-PROCESS": "Zahájit proces", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Výchozí", "OPEN_DIALOG": "Otevřít dialogové okno", "SHOW_LIST_LABEL": "Na seznam pro zobrazení klikněte" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/da.json b/demo-shell/resources/i18n/da.json index de5f431789..fa98da4927 100755 --- a/demo-shell/resources/i18n/da.json +++ b/demo-shell/resources/i18n/da.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Brug tilpasset skabelon til overskrift 'Bruger'", "CUSTOM_COLUMN_HEADER": "Tilpasset brugeroverskriftskabelon" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Du skal vælge en rapport på listen til venstre" - }, "PS-TAB": { "TASKS-TAB": "Opgaver", "PROCESSES-TAB": "Proces", - "REPORTS-TAB": "Rapporter", "SETTINGS-TAB": "Indstillinger", "START-TASK": "Start opgave", "START-PROCESS": "Start proces", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Standard", "OPEN_DIALOG": "Åbn dialog", "SHOW_LIST_LABEL": "Klik for at vise listen" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/de.json b/demo-shell/resources/i18n/de.json index 77c045a2c6..58ffdd5980 100755 --- a/demo-shell/resources/i18n/de.json +++ b/demo-shell/resources/i18n/de.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Benutzerdefinierte Vorlage für 'Benutzer'-Kopfzeile verwenden", "CUSTOM_COLUMN_HEADER": "Benutzerdefinierte Vorlage für Benutzer-Kopfzeile" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Kein Bericht ausgewählt. Wählen Sie einen Bericht aus der Liste" - }, "PS-TAB": { "TASKS-TAB": "Aufgaben", "PROCESSES-TAB": "Prozess", - "REPORTS-TAB": "Berichte", "SETTINGS-TAB": "Einstellungen", "START-TASK": "Aufgabe starten", "START-PROCESS": "Prozess starten", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Standard", "OPEN_DIALOG": "Dialog öffnen", "SHOW_LIST_LABEL": "Klicken Sie, um die Liste anzuzeigen" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json index 6785e1053b..5359e1634e 100644 --- a/demo-shell/resources/i18n/en.json +++ b/demo-shell/resources/i18n/en.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Use custom template for 'User' header", "CUSTOM_COLUMN_HEADER": "Custom User Header Template" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "No report selected. Choose a report from the list" - }, "PS-TAB": { "TASKS-TAB": "Tasks", "PROCESSES-TAB": "Process", - "REPORTS-TAB": "Reports", "SETTINGS-TAB": "Settings", "START-TASK": "Start task", "START-PROCESS": "Start process", diff --git a/demo-shell/resources/i18n/es.json b/demo-shell/resources/i18n/es.json index 672d0caa1c..f9226aec88 100755 --- a/demo-shell/resources/i18n/es.json +++ b/demo-shell/resources/i18n/es.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Utilizar una plantilla personalizada para el encabezado 'Usuario'", "CUSTOM_COLUMN_HEADER": "Plantilla de encabezado de usuario personalizado" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "No se ha seleccionado ningún informe. Elija un informe de la lista." - }, "PS-TAB": { "TASKS-TAB": "Tareas", "PROCESSES-TAB": "Proceso", - "REPORTS-TAB": "Informes", "SETTINGS-TAB": "Configuración", "START-TASK": "Iniciar tarea", "START-PROCESS": "Iniciar proceso", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Predeterminado", "OPEN_DIALOG": "Abrir cuadro de diálogo", "SHOW_LIST_LABEL": "Hacer clic para mostrar la lista" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/fi.json b/demo-shell/resources/i18n/fi.json index 037506a11e..c56d96fce3 100755 --- a/demo-shell/resources/i18n/fi.json +++ b/demo-shell/resources/i18n/fi.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Käytä mukautettua mallia \"Käyttäjä\"-otsikolle", "CUSTOM_COLUMN_HEADER": "Mukautettu käyttäjäotsikon malli" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Yhtään raporttia ei ole valittuna. Valitse raportti luettelosta." - }, "PS-TAB": { "TASKS-TAB": "Tehtävät", "PROCESSES-TAB": "Prosessi", - "REPORTS-TAB": "Raportit", "SETTINGS-TAB": "Asetukset", "START-TASK": "Aloita tehtävä", "START-PROCESS": "Käynnistä prosessi", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Oletus", "OPEN_DIALOG": "Avaa valintaikkuna", "SHOW_LIST_LABEL": "Näytä luettelo napsauttamalla" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/fr.json b/demo-shell/resources/i18n/fr.json index 192f47fb61..12f3e953ab 100755 --- a/demo-shell/resources/i18n/fr.json +++ b/demo-shell/resources/i18n/fr.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Utiliser un modèle personnalisé pour l'en-tête 'Utilisateur'", "CUSTOM_COLUMN_HEADER": "Modèle d'en-tête Utilisateur personnalisé" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Aucun rapport sélectionné. Choisissez un rapport dans la liste" - }, "PS-TAB": { "TASKS-TAB": "Tâches", "PROCESSES-TAB": "Processus", - "REPORTS-TAB": "Rapports", "SETTINGS-TAB": "Paramètres", "START-TASK": "Démarrer la tâche", "START-PROCESS": "Démarrer le processus", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Par défaut", "OPEN_DIALOG": "Boîte de dialogue Ouvrir", "SHOW_LIST_LABEL": "Cliquer pour afficher la liste" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/it.json b/demo-shell/resources/i18n/it.json index faa37b8cb7..18ebd88a5f 100755 --- a/demo-shell/resources/i18n/it.json +++ b/demo-shell/resources/i18n/it.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Usa il modello personalizzato per l'intestazione \"Utente\"", "CUSTOM_COLUMN_HEADER": "Modello personalizzato per intestazione Utente" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Nessun rapporto selezionato. Scegliere un rapporto dall'elenco" - }, "PS-TAB": { "TASKS-TAB": "Compiti", "PROCESSES-TAB": "Processo", - "REPORTS-TAB": "Rapporti", "SETTINGS-TAB": "Impostazioni", "START-TASK": "Avvia compito", "START-PROCESS": "Avvia processo", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Predefinito", "OPEN_DIALOG": "Apri finestra di dialogo", "SHOW_LIST_LABEL": "Fai clic per mostrare l'elenco" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/ja.json b/demo-shell/resources/i18n/ja.json index b72f5a1842..12b31309fe 100755 --- a/demo-shell/resources/i18n/ja.json +++ b/demo-shell/resources/i18n/ja.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "「ユーザー」ヘッダーにカスタムテンプレートを使用", "CUSTOM_COLUMN_HEADER": "カスタムユーザーヘッダーテンプレート" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "レポートが選択されていません。リストからレポートを選択してください。" - }, "PS-TAB": { "TASKS-TAB": "タスク", "PROCESSES-TAB": "プロセス", - "REPORTS-TAB": "レポート", "SETTINGS-TAB": "設定", "START-TASK": "タスクの開始", "START-PROCESS": "プロセスの開始", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "デフォルト", "OPEN_DIALOG": "ダイアログを開く", "SHOW_LIST_LABEL": "クリックしてリストを表示" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/nb.json b/demo-shell/resources/i18n/nb.json index 020e1e1b8c..ce8ba76113 100755 --- a/demo-shell/resources/i18n/nb.json +++ b/demo-shell/resources/i18n/nb.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Bruk egendefinert mal for toppteksten 'bruker'", "CUSTOM_COLUMN_HEADER": "Egendefinert topptekst for bruker" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Ingen rapport valgt. Velg en rapport fra listen" - }, "PS-TAB": { "TASKS-TAB": "Oppgaver", "PROCESSES-TAB": "Prosess", - "REPORTS-TAB": "Rapporter", "SETTINGS-TAB": "Innstillinger", "START-TASK": "Start oppgave", "START-PROCESS": "Start prosess", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Standard", "OPEN_DIALOG": "Åpne dialog", "SHOW_LIST_LABEL": "Klikk for å vise listen" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/nl.json b/demo-shell/resources/i18n/nl.json index 7e30effcf4..9d36ddafa8 100755 --- a/demo-shell/resources/i18n/nl.json +++ b/demo-shell/resources/i18n/nl.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Aangepaste sjabloon voor 'User'-koptekst gebruiken", "CUSTOM_COLUMN_HEADER": "Aangepaste sjabloon voor User-koptekst" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Geen rapport geselecteerd. Kies een rapport uit de lijst" - }, "PS-TAB": { "TASKS-TAB": "Taken", "PROCESSES-TAB": "Proces", - "REPORTS-TAB": "Rapporten", "SETTINGS-TAB": "Instellingen", "START-TASK": "Taak starten", "START-PROCESS": "Proces starten", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Standaard", "OPEN_DIALOG": "Dialoogvenster Openen", "SHOW_LIST_LABEL": "Klik om de lijst weer te geven" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/pl.json b/demo-shell/resources/i18n/pl.json index 82b5a3c3a6..62cc142d4d 100755 --- a/demo-shell/resources/i18n/pl.json +++ b/demo-shell/resources/i18n/pl.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Użyj szablonu niestandardowego dla nagłówka 'Użytkownik'", "CUSTOM_COLUMN_HEADER": "Szablon niestandardowy nagłówka Użytkownik" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Nie wybrano raportu. Wybierz raport z listy." - }, "PS-TAB": { "TASKS-TAB": "Zadania", "PROCESSES-TAB": "Proces", - "REPORTS-TAB": "Raporty", "SETTINGS-TAB": "Ustawienia", "START-TASK": "Rozpocznij zadanie", "START-PROCESS": "Rozpocznij proces", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Domyślne", "OPEN_DIALOG": "Otwórz okno dialogowe", "SHOW_LIST_LABEL": "Kliknij, aby wyświetlić listę" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/pt-BR.json b/demo-shell/resources/i18n/pt-BR.json index 6775439c78..9fd00f5d87 100755 --- a/demo-shell/resources/i18n/pt-BR.json +++ b/demo-shell/resources/i18n/pt-BR.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Usar modelo personalizado para o cabeçalho 'Usuário'", "CUSTOM_COLUMN_HEADER": "Modelo personalizado do cabeçalho Usuário" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Nenhum relatório selecionado. Escolha um relatório na lista" - }, "PS-TAB": { "TASKS-TAB": "Tarefas", "PROCESSES-TAB": "Processo", - "REPORTS-TAB": "Relatórios", "SETTINGS-TAB": "Configurações", "START-TASK": "Iniciar tarefa", "START-PROCESS": "Iniciar processo", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Padrão", "OPEN_DIALOG": "Abrir caixa de diálogo", "SHOW_LIST_LABEL": "Clique para mostrar a lista" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/ru.json b/demo-shell/resources/i18n/ru.json index 6a9e97fd90..3344bfd31e 100755 --- a/demo-shell/resources/i18n/ru.json +++ b/demo-shell/resources/i18n/ru.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Использовать пользовательский шаблон для заголовка «Пользователь»", "CUSTOM_COLUMN_HEADER": "Пользовательский шаблон заголовка пользователя" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Отчет не выбран. Выберите отчет из списка" - }, "PS-TAB": { "TASKS-TAB": "Задачи", "PROCESSES-TAB": "Процесс", - "REPORTS-TAB": "Отчеты", "SETTINGS-TAB": "Параметры", "START-TASK": "Начать задачу", "START-PROCESS": "Начать процесс", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "По умолчанию", "OPEN_DIALOG": "Открыть диалог", "SHOW_LIST_LABEL": "Нажмите для отображения списка" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/sv.json b/demo-shell/resources/i18n/sv.json index 4b5bd4fff5..502e9ffaff 100755 --- a/demo-shell/resources/i18n/sv.json +++ b/demo-shell/resources/i18n/sv.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "Använd anpassad mall för \"Användare\"-rubrik", "CUSTOM_COLUMN_HEADER": "Anpassad användarhuvudmall" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "Ingen rapport vald. Välj en rapport från listan" - }, "PS-TAB": { "TASKS-TAB": "Uppgifter", "PROCESSES-TAB": "Process", - "REPORTS-TAB": "Rapporter", "SETTINGS-TAB": "Inställningar", "START-TASK": "Starta uppgift", "START-PROCESS": "Starta process", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "Standard", "OPEN_DIALOG": "Öppna dialogruta", "SHOW_LIST_LABEL": "Klicka för att visa listan" -} \ No newline at end of file +} diff --git a/demo-shell/resources/i18n/zh-CN.json b/demo-shell/resources/i18n/zh-CN.json index aa6ed0958b..639339ecee 100755 --- a/demo-shell/resources/i18n/zh-CN.json +++ b/demo-shell/resources/i18n/zh-CN.json @@ -224,13 +224,9 @@ "USE_CUSTOM_COLUMN_HEADER": "为“用户”标题使用自定义模板", "CUSTOM_COLUMN_HEADER": "自定义用户标题模板" }, - "ANALYTICS_REPORT": { - "NO_REPORT_MESSAGE": "未选择报告，请从列表中选择报告" - }, "PS-TAB": { "TASKS-TAB": "任务", "PROCESSES-TAB": "流程", - "REPORTS-TAB": "报告", "SETTINGS-TAB": "设置", "START-TASK": "启动任务", "START-PROCESS": "启动流程", @@ -389,4 +385,4 @@ "DEFAULT_SEARCH": "默认值", "OPEN_DIALOG": "打开对话框", "SHOW_LIST_LABEL": "单击以显示列表" -} \ No newline at end of file +} diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts index 6ab7901c41..ed4c4c0768 100644 --- a/demo-shell/src/app/app.module.ts +++ b/demo-shell/src/app/app.module.ts @@ -18,7 +18,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { APP_INITIALIZER, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { ChartsModule } from 'ng2-charts'; +import { NgChartsModule } from 'ng2-charts'; import { HttpClientModule } from '@angular/common/http'; import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule } from '@ngx-translate/core'; @@ -59,7 +59,7 @@ import { TaskAttachmentsComponent } from './components/process-service/task-atta import { ProcessAttachmentsComponent } from './components/process-service/process-attachments.component'; import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component'; import { DemoPermissionComponent } from './components/permissions/demo-permissions.component'; -import { MonacoEditorModule } from 'ngx-monaco-editor'; +import { MonacoEditorModule } from 'ngx-monaco-editor-v2'; import { ContentModule } from '@alfresco/adf-content-services'; import { InsightsModule } from '@alfresco/adf-insights'; import { ProcessModule } from '@alfresco/adf-process-services'; @@ -151,7 +151,7 @@ registerLocaleData(localeSv); ProcessServicesCloudModule.forRoot(), ExtensionsModule.forRoot(), ThemePickerModule, - ChartsModule, + NgChartsModule, AppCloudSharedModule, MonacoEditorModule.forRoot() ], diff --git a/demo-shell/src/app/components/config-editor/config-editor.module.ts b/demo-shell/src/app/components/config-editor/config-editor.module.ts index af76851960..48026ac05e 100644 --- a/demo-shell/src/app/components/config-editor/config-editor.module.ts +++ b/demo-shell/src/app/components/config-editor/config-editor.module.ts @@ -20,7 +20,7 @@ import { ConfigEditorComponent } from './config-editor.component'; import { Routes, RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; import { CoreModule } from '@alfresco/adf-core'; -import { MonacoEditorModule } from 'ngx-monaco-editor'; +import { MonacoEditorModule } from 'ngx-monaco-editor-v2'; const routes: Routes = [ { diff --git a/demo-shell/src/app/components/process-service/process-service.component.html b/demo-shell/src/app/components/process-service/process-service.component.html index d79537b4ab..392d8d7f84 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.html +++ b/demo-shell/src/app/components/process-service/process-service.component.html @@ -245,29 +245,6 @@ - -
-
-
Report List
 - -
-
- - -
- {{'ANALYTICS_REPORT.NO_REPORT_MESSAGE' | translate}} -
-
-
-
diff --git a/demo-shell/src/app/components/process-service/process-service.component.scss b/demo-shell/src/app/components/process-service/process-service.component.scss index fb95328217..fb41b96c8e 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.scss +++ b/demo-shell/src/app/components/process-service/process-service.component.scss @@ -104,13 +104,13 @@ min-width: 225px; } - .app-reports-menu, .app-settings-menu { + .app-settings-menu { flex: 1 1 300px; max-width: 300px; min-width: 300px; } - .app-tasks-details, .app-tasks-start, .app-processes-details, .app-processes-start, .app-reports-details, .app-settings-details { + .app-tasks-details, .app-tasks-start, .app-processes-details, .app-processes-start, .app-settings-details { flex: 1 1 auto; min-width: auto; } diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts index fdadce4496..b6d264ede5 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.ts +++ b/demo-shell/src/app/components/process-service/process-service.component.ts @@ -38,9 +38,6 @@ import { FORM_FIELD_VALIDATORS, FormRenderingService, FormService, AppConfigService, PaginationComponent, UserPreferenceValues, AlfrescoApiService, UserPreferencesService, LogService, DataCellEvent, NotificationService } from '@alfresco/adf-core'; - -import { AnalyticsReportListComponent } from '@alfresco/adf-insights'; - import { ProcessFiltersComponent, ProcessInstance, @@ -109,9 +106,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit @ViewChild('activitiStartProcess') activitiStartProcess: StartProcessInstanceComponent; - @ViewChild('analyticsReportList', { static: true }) - analyticsReportList: AnalyticsReportListComponent; - @Input() appId: number = null; @@ -120,7 +114,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit @Output() changePageSize = new EventEmitter(); - selectFirstReport = false; multiSelectTask = false; multiSelectProcess = false; selectionMode = 'single'; @@ -147,7 +140,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit activeTab: number = this.tabs.tasks; // tasks|processes|reports taskFilter: FilterRepresentationModel; - report: any; processFilter: UserProcessInstanceFilterRepresentation; blobFile: any; flag = true; @@ -313,10 +305,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit this.changePageSize.emit(event); } - onReportClick(event: any): void { - this.report = event; - } - onSuccessTaskFilterList(): void { this.applyTaskFilter(this.activitiFilter.getCurrentFilter()); } @@ -380,19 +368,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit this.currentProcessInstanceId = processInstanceId; } - onEditReport(): void { - this.analyticsReportList.reload(); - } - - onReportSaved(reportId: number): void { - this.analyticsReportList.reload(reportId); - } - - onReportDeleted(): void { - this.analyticsReportList.reload(); - this.analyticsReportList.selectReport(null); - } - navigateStartProcess(): void { this.currentProcessInstanceId = currentProcessIdNew; } diff --git a/lib/insights/package.json b/lib/insights/package.json index 0d421bbcf2..96a8f3b7ae 100644 --- a/lib/insights/package.json +++ b/lib/insights/package.json @@ -18,9 +18,9 @@ "@angular/material": ">=14.1.2", "@alfresco/adf-core": ">=6.2.0", "@ngx-translate/core": ">=14.0.0", - "chart.js": ">=2.9.4", + "chart.js": "^4.3.0", "moment": ">=2.22.2", - "ng2-charts": ">=2.3.2", + "ng2-charts": "^4.1.1", "raphael": ">=2.3.0" }, "keywords": [ diff --git a/lib/insights/src/lib/analytics-process/analytics-process.module.ts b/lib/insights/src/lib/analytics-process/analytics-process.module.ts index 70b11128ca..faa748eec9 100644 --- a/lib/insights/src/lib/analytics-process/analytics-process.module.ts +++ b/lib/insights/src/lib/analytics-process/analytics-process.module.ts @@ -20,16 +20,13 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { DiagramsModule } from '../diagram/diagram.module'; import { MaterialModule } from '../material.module'; - -import { ChartsModule } from 'ng2-charts'; - +import { NgChartsModule } from 'ng2-charts'; import { CoreModule } from '@alfresco/adf-core'; import { AnalyticsGeneratorComponent } from './components/analytics-generator.component'; import { AnalyticsReportHeatMapComponent } from './components/analytics-report-heat-map.component'; import { AnalyticsReportListComponent } from './components/analytics-report-list.component'; import { AnalyticsReportParametersComponent } from './components/analytics-report-parameters.component'; import { AnalyticsComponent } from './components/analytics.component'; - import { CheckboxWidgetAnalyticsComponent } from './components/widgets/checkbox/checkbox.widget'; import { DateRangeWidgetComponent } from './components/widgets/date-range/date-range.widget'; import { DropdownWidgetAnalyticsComponent } from './components/widgets/dropdown/dropdown.widget'; @@ -41,7 +38,7 @@ import { NumberWidgetAnalyticsComponent } from './components/widgets/number/numb FormsModule, ReactiveFormsModule, CommonModule, - ChartsModule, + NgChartsModule, DiagramsModule, MaterialModule, CoreModule diff --git a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.html b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.html index 176ef8e741..d4a1c0917d 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.html +++ b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.html @@ -18,9 +18,10 @@
{{'ANALYTICS.MESSAGES.ZERO-DATA-FOUND' | translate}}
+ [type]="'pie'" + [options]="report.options">
@@ -75,7 +76,7 @@ [datasets]="report.datasets" [labels]="report.labels" [options]="report.options" - [chartType]="'bar'"> + [type]="'bar'"> @@ -95,7 +96,7 @@ [datasets]="report.datasets" [labels]="report.labels" [options]="report.options" - [chartType]="'bar'"> + [type]="'bar'"> diff --git a/package-lock.json b/package-lock.json index 68a76bf87f..7b4184f045 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^15.0.1", "apollo-angular": "^4.2.1", - "chart.js": "2.9.4", + "chart.js": "^4.3.0", "cropperjs": "1.5.13", "date-fns": "^2.30.0", "dotenv-expand": "^5.1.0", @@ -43,8 +43,9 @@ "material-icons": "^1.13.8", "minimatch": "^9.0.0", "minimatch-browser": "1.0.0", - "ng2-charts": "2.4.2", - "ngx-monaco-editor": "8.1.1", + "monaco-editor": "^0.33.0", + "ng2-charts": "^4.1.1", + "ngx-monaco-editor-v2": "^14.0.4", "pdfjs-dist": "3.3.122", "raphael": "2.3.0", "rxjs": "6.6.6", @@ -5073,6 +5074,11 @@ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, + "node_modules/@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==" + }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", @@ -24278,14 +24284,6 @@ "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==", "dev": true }, - "node_modules/@types/chart.js": { - "version": "2.9.37", - "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.37.tgz", - "integrity": "sha512-9bosRfHhkXxKYfrw94EmyDQcdjMaQPkU1fH2tDxu8DWXxf1mjzWQAV4laJF51ZbC2ycYwNDvIm1rGez8Bug0vg==", - "dependencies": { - "moment": "^2.10.2" - } - }, "node_modules/@types/connect": { "version": "3.4.35", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", @@ -28500,29 +28498,14 @@ "dev": true }, "node_modules/chart.js": { - "version": "2.9.4", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz", - "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz", + "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==", "dependencies": { - "chartjs-color": "^2.1.0", - "moment": "^2.10.2" - } - }, - "node_modules/chartjs-color": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz", - "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==", - "dependencies": { - "chartjs-color-string": "^0.6.0", - "color-convert": "^1.9.3" - } - }, - "node_modules/chartjs-color-string": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz", - "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==", - "dependencies": { - "color-name": "^1.0.0" + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": ">=7" } }, "node_modules/check-error": { @@ -43251,6 +43234,11 @@ "node": "*" } }, + "node_modules/monaco-editor": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz", + "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" + }, "node_modules/move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -43708,38 +43696,34 @@ } }, "node_modules/ng2-charts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-2.4.2.tgz", - "integrity": "sha512-mY3C2uKCaApHCQizS2YxEOqQ7sSZZLxdV6N1uM9u/VvUgVtYvlPtdcXbKpN52ak93ZE22I73DiLWVDnDNG4/AQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-4.1.1.tgz", + "integrity": "sha512-iHwXDbmX86lfeH8VRcsaW2tJATsuAZo4kvvC/Yk2l35zOHjevja1qBvO6BAibiDazi9r9aS6ZRJOqWPsz1pP2w==", "dependencies": { - "@types/chart.js": "^2.9.24", "lodash-es": "^4.17.15", - "tslib": "^2.0.0" + "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": ">=7.2.0", - "@angular/core": ">=7.2.0", - "chart.js": "^2.9.3", - "rxjs": "^6.3.3" + "@angular/cdk": ">=14.0.0", + "@angular/common": ">=14.0.0", + "@angular/core": ">=14.0.0", + "chart.js": "^3.4.0 || ^4.0.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/ngx-monaco-editor": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/ngx-monaco-editor/-/ngx-monaco-editor-8.1.1.tgz", - "integrity": "sha512-SmUGFG5m2HHWybHD6qXdB1FrtC/XySSHm5O/E1cDGW7moIWzJGqiitCKLJdSh9D2hsoe8oBNEg74vYF1UGznsQ==", + "node_modules/ngx-monaco-editor-v2": { + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/ngx-monaco-editor-v2/-/ngx-monaco-editor-v2-14.0.4.tgz", + "integrity": "sha512-l1r5i6Xsn3OZed2DoUsYRgjHM1TvrOZId7JRNRGzCs7fjE8zvv1Kz/KimH2Ef9rF+ItUD4FUI29u9u6/NOf+fQ==", "dependencies": { - "tslib": "^1.9.0" + "tslib": "^2.1.0" }, "peerDependencies": { - "@angular/common": ">= 2.0.0", - "@angular/core": ">= 2.0.0" + "@angular/common": "^14.1.0", + "@angular/core": "^14.1.0", + "monaco-editor": "^0.33.0" } }, - "node_modules/ngx-monaco-editor/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", diff --git a/package.json b/package.json index 7863700d2a..9c63104775 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^15.0.1", "apollo-angular": "^4.2.1", - "chart.js": "2.9.4", + "chart.js": "^4.3.0", "cropperjs": "1.5.13", "date-fns": "^2.30.0", "dotenv-expand": "^5.1.0", @@ -87,8 +87,9 @@ "material-icons": "^1.13.8", "minimatch": "^9.0.0", "minimatch-browser": "1.0.0", - "ng2-charts": "2.4.2", - "ngx-monaco-editor": "8.1.1", + "monaco-editor": "^0.33.0", + "ng2-charts": "^4.1.1", + "ngx-monaco-editor-v2": "^14.0.4", "pdfjs-dist": "3.3.122", "raphael": "2.3.0", "rxjs": "6.6.6",