fix(settings/automation-manager): bug fixes KMCNG-2618, KMCNG-2620, K…

…MCNG-2625, KMCNG-2626, KMCNG-2627
kaltura · Apr 15, 2024 · 4c52b67 · 4c52b67
1 parent a4da5a4
commit 4c52b67
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/src/applications/settings-mr-app/logs/logs.component.ts b/src/applications/settings-mr-app/logs/logs.component.ts
@@ -12,6 +12,7 @@ import {AppLocalization} from '@kaltura-ng/mc-shared';
 import {KalturaLogger} from '@kaltura-ng/kaltura-logger';
 import {ColumnsResizeManagerService, ResizableColumnsTableName} from 'app-shared/kmc-shared/columns-resize-manager';
 import {ReviewTagsComponent} from '../review/review-tags/review-tags.component';
+import {BrowserService} from 'app-shared/kmc-shell';
 
 @Component({
     selector: 'kMrLogs',
@@ -43,6 +44,7 @@ export class LogsComponent implements OnInit {
 
     constructor(private _mrMainViewService: SettingsMrMainViewService,
                 public _columnsResizeManager: ColumnsResizeManagerService,
+                private _browserService: BrowserService,
                 private _appLocalization: AppLocalization,
                 private _logger: KalturaLogger,
                 private _mrStore: MrStoreService) {
@@ -158,11 +160,15 @@ export class LogsComponent implements OnInit {
     public download(id: string): void {
         this._isBusy = true;
         this._mrStore.downloadReport(id).subscribe(
-            success => {
+            data => {
                 this._isBusy = false;
+                this._browserService.download(data, id + '.csv', 'text/csv');
             },
             error => {
-                this.displayError(this._appLocalization.get('applications.settings.mr.reportDownloadError'), () => this.download(id));
+                // temp solution until BE supports text/csv content-type for the request
+                this._isBusy = false;
+                this._browserService.download(error?.error?.text || '', id + '.csv', 'text/csv');
+                // this.displayError(this._appLocalization.get('applications.settings.mr.reportDownloadError'), () => this.download(id));
             }
         );
     }

diff --git a/src/applications/settings-mr-app/mr-store/mr-store.service.ts b/src/applications/settings-mr-app/mr-store/mr-store.service.ts
@@ -274,9 +274,9 @@ export class MrStoreService implements OnDestroy {
         }
     }
 
-    public downloadReport(id: string): Observable<LoadReportsResponse> {
+    public downloadReport(id: string): Observable<string> {
         try {
-            return this._http.post(`${serverConfig.externalServices.mrEndpoint.uri}/report/serve`, {id}, this.getHttpOptions()).pipe(cancelOnDestroy(this)) as Observable<LoadReportsResponse>;
+            return this._http.post(`${serverConfig.externalServices.mrEndpoint.uri}/report/serve`, {id}, this.getHttpOptions()).pipe(cancelOnDestroy(this)) as Observable<string>;
         } catch (ex) {
             return throwError(new Error('An error occurred while trying to serve report'));
         }
@@ -293,6 +293,16 @@ export class MrStoreService implements OnDestroy {
         };
     }
 
+    private getHttpDownloadOptions() {
+        const ks = this._appAuthentication.appUser.ks;
+        return {
+            headers: new HttpHeaders({
+                'authorization': `KS ${ks}`,
+                'Content-Type': 'text/csv',
+            })
+        };
+    }
+
     ngOnDestroy(): void {
     }
 }
diff --git a/src/applications/settings-mr-app/rule/actions/renderers/notification.component.ts b/src/applications/settings-mr-app/rule/actions/renderers/notification.component.ts
@@ -128,7 +128,7 @@ export class ActionNotificationComponent implements OnDestroy{
 
     public validate(): void {
         if (this.selected) {
-            if (!this.action || (this.action.requires === 'delete' && !this.action.task.id)) {
+            if (!this.action || this.action.requires === 'delete') {
                 this.action = {
                     requires: 'create',
                     type: this.getNotificationType(),

diff --git a/src/applications/settings-mr-app/rule/criteria/renderers/created.component.ts b/src/applications/settings-mr-app/rule/criteria/renderers/created.component.ts
@@ -49,7 +49,7 @@ export class CriteriaCreatedComponent implements OnInit{
             if (value && value[key]) {
                 this.createdTimeInterval = key;
                 this.createdTime = Math.abs(value[key].numberOfUnits) || 0;
-                this.createdTimeUnit = value[key].createdTimeUnit || 'day';
+                this.createdTimeUnit = value[key].dateUnit || 'day';
             }
         });
     }

diff --git a/src/applications/settings-mr-app/rule/criteria/renderers/played.component.ts b/src/applications/settings-mr-app/rule/criteria/renderers/played.component.ts
@@ -42,14 +42,14 @@ export class CriteriaPlayedComponent implements OnInit{
 
     public playedTimeUnit = 'day';
     public playedTime = 0;
-    public playedTimeInterval = 'less';
+    public playedTimeInterval = 'lastPlayedAtLessThanOrEqual';
 
     @Input() set filter(value: any) {
         ['lastPlayedAtLessThanOrEqual', 'lastPlayedAtGreaterThanOrEqual'].forEach(key => {
             if (value && value[key]) {
                 this.playedTimeInterval = key;
                 this.playedTime = Math.abs(value[key].numberOfUnits) || 0;
-                this.playedTimeUnit = value[key].createdTimeUnit || 'day';
+                this.playedTimeUnit = value[key].dateUnit || 'day';
             }
         });
     }

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -3671,7 +3671,7 @@
                     "repeat": "Repeat",
                     "every": "Every",
                     "period": "Review period",
-                    "period_tt": "Review period tooltip",
+                    "period_tt": "Set a time period (in days) to review queued entries with one or more actions scheduled to be performed",
                     "startDate": "Start date",
                     "on": "On day",
                     "of": "of the month"