refactor(octra): fix asr-options actions not changing in favour of qu…

…eue state
IPS-LMU · Oct 26, 2023 · 5e6543d · 5e6543d
1 parent f4b45b5
commit 5e6543d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 25 deletions.
diff --git a/apps/octra/src/app/core/component/asr-options/asr-options.component.html b/apps/octra/src/app/core/component/asr-options/asr-options.component.html
@@ -11,7 +11,7 @@
         ngbDropdownToggle
       >
         <ng-container
-          *ngIf="(asrStoreService.asrOptions$|async)?.selectedLanguage === undefined; else asrAllSet"
+          *ngIf="(asrStoreService.asrOptions$|async)?.selectedLanguage === null || (asrStoreService.asrOptions$|async)?.selectedLanguage === undefined || (asrStoreService.asrOptions$|async)?.selectedLanguage === ''; else asrAllSet"
         >
           {{ 'asr.without asr' | transloco }}
         </ng-container>

diff --git a/apps/octra/src/app/core/component/navbar/navbar.component.html b/apps/octra/src/app/core/component/navbar/navbar.component.html
@@ -446,7 +446,7 @@
             role="menu"
             (click)="$event.stopPropagation()"
           >
-            <table class="table">
+            <table class="table w-100">
               <tr>
                 <td>
                   <label class="form-check-label" for="easymode"
@@ -564,7 +564,8 @@
               >
               <br />
               <div
-                class="btn-group w-100"
+                style="min-width: 300px;"
+                class="btn-group"
                 role="group"
                 aria-label="Basic example"
               >

diff --git a/apps/octra/src/app/core/component/navbar/navbar.component.scss b/apps/octra/src/app/core/component/navbar/navbar.component.scss
@@ -6,7 +6,6 @@
 .info-menu {
   padding: 20px;
   font-size: 0.7em;
-  min-width: 300px;
 }
 
 .dropdown-menu.options-menu.show label,
@@ -110,3 +109,7 @@
 .dropdown-toggle::after {
   content: unset;
 }
+
+.form-switch.form-check-reverse {
+  display: block;
+}
diff --git a/apps/octra/src/app/core/component/transcr-editor/transcr-editor.component.ts b/apps/octra/src/app/core/component/transcr-editor/transcr-editor.component.ts
@@ -422,11 +422,6 @@ export class TranscrEditorComponent
       this.shortcutService.unregisterShortcutGroup('texteditor');
       this.shortcutService.registerShortcutGroup(this.shortcuts);
 
-      this.asrStoreService.stopItemProcessing({
-        sampleStart: this.audiochunk.time.start.samples,
-        sampleLength: this.audiochunk.time.duration.samples,
-      });
-
       this.joditOptions = {
         ...this.joditDefaultOptions,
         showCharsCounter: false,

diff --git a/apps/octra/src/app/core/store/asr/asr.effects.service.ts b/apps/octra/src/app/core/store/asr/asr.effects.service.ts
@@ -174,13 +174,21 @@ export class AsrEffects {
                   item,
                 })
               );
+            } else if (
+              ![
+                ASRActions.processQueueItem.do.type,
+                ASRActions.startProcessing.do.type,
+              ].includes(action.type as any)
+            ) {
+              if (queue.statistics.running === 0) {
+                // no free item after continuation and nothing running
+                return of(
+                  ASRActions.setQueueStatus.do({
+                    status: ASRProcessStatus.IDLE,
+                  })
+                );
+              }
             }
-            // no free item
-            return of(
-              ASRActions.setQueueStatus.do({
-                status: ASRProcessStatus.IDLE,
-              })
-            );
           }
 
           // max parallel reached
@@ -190,11 +198,7 @@ export class AsrEffects {
             })
           );
         }
-        return of(
-          ASRActions.setQueueStatus.do({
-            status: ASRProcessStatus.IDLE,
-          })
-        );
+        return of();
       })
     )
   );

diff --git a/apps/octra/src/app/core/store/asr/index.ts b/apps/octra/src/app/core/store/asr/index.ts
@@ -1,7 +1,7 @@
 import { ASRLanguage, ASRService, ASRSettings } from '../../obj';
 
 export interface ASRStateSettings {
-  selectedLanguage?: string;
+  selectedLanguage?: string | null;
   selectedService?: string;
   selectedMausLanguage?: string;
   accessCode?: string;
@@ -16,7 +16,6 @@ export enum ASRQueueItemType {
 export enum ASRProcessStatus {
   IDLE = 'IDLE',
   STARTED = 'STARTED',
-  RUNNING = 'RUNNING',
   STOPPED = 'STOPPED',
   NOQUOTA = 'NOQUOTA',
   NOAUTH = 'NOAUTH',

diff --git a/apps/octra/src/app/editors/2D-editor/transcr-window/transcr-window.component.ts b/apps/octra/src/app/editors/2D-editor/transcr-window/transcr-window.component.ts
@@ -382,7 +382,7 @@ export class TranscrWindowComponent
         this.segmentIndex
       ] as OctraAnnotationSegment;
 
-      if (segment?.context?.asr?.isBlockedBy === undefined) {
+      if (!segment?.context?.asr?.isBlockedBy) {
         this.audiochunk.startPlayback().catch((error) => {
           console.error(error);
         });
@@ -539,7 +539,7 @@ export class TranscrWindowComponent
           this.segmentIndex
         ] as OctraAnnotationSegment;
 
-        if (segment!.context?.asr?.isBlockedBy === undefined) {
+        if (!segment!.context?.asr?.isBlockedBy) {
           this.audiochunk.startPlayback().catch((error) => {
             console.error(error);
           });
@@ -1111,6 +1111,7 @@ export class TranscrWindowComponent
           : this.audioManager.createSampleUnit(0);
       this.audiochunk.selection.end = this.tempSegments[i]!.time.clone();
       this.loupe.av.drawnSelection = this.audiochunk.selection;
+
       this.audiochunk.startPlayback().catch((error) => {
         console.error(error);
       });

diff --git a/libs/ngx-components/src/lib/components/audio/audio-viewer/audio-viewer.service.ts b/libs/ngx-components/src/lib/components/audio/audio-viewer/audio-viewer.service.ts
@@ -143,7 +143,6 @@ export class AudioViewerService {
     if (value > -1 && this._dragableBoundaryID === -1) {
       // started
       this.tempAnnotation = this.annotation;
-      console.log(`boundary ${value} started dragging`);
       this._boundaryDragging.next({
         shiftPressed: this.shiftPressed,
         status: 'started',