;
- const dialogRef = this.dialog.open(AdvancedBuilderDialogComponent, config);
+ width: '400px'
+ } as MatDialogConfig;
+ const dialogRef = this.dialog.open(BatchAddTargetDialogComponent, config);
dialogRef
.afterClosed()
.pipe(filter((r) => r != null))
.subscribe((r: Array) => {
- this.formBuilder.removeTargetForm(0);
- const mediaCollectionId = this.formBuilder.form.get('mediaCollection').value;
- this.collectionService.postApiV2CollectionByCollectionIdResolve(mediaCollectionId, r).subscribe((items) => {
- items.forEach((item) => {
- const form = this.formBuilder.addTargetForm("SINGLE_MEDIA_ITEM");
- console.log(`Adding new mediaItem as target ${mediaCollectionId}/${item.name}`);
- form.get('mediaItem').setValue(item);
- });
- });
- /*r.forEach((name, idx) => {
- const form = this.builder.addTargetForm(ConfiguredOptionTargetOption.OptionEnum.MULTIPLE_MEDIA_ITEMS);
- console.log(`${mediaCollectionId} ? ${name}`);
- const nameNoExt = name.substring(0, name.lastIndexOf('.'));
- this.collectionService.getApiV1CollectionWithCollectionidWithStartswith(mediaCollectionId, nameNoExt)
- .subscribe(item => {
- console.log(`Added ${item[0]}`);
- form.get('mediaItem').setValue(item[0]);
- }
- );
- });*/
+ let targets : ApiTarget[]
+ switch(this.taskType.targetOption){
+ case "SINGLE_MEDIA_ITEM":
+ case "SINGLE_MEDIA_SEGMENT":
+ const obs = r.map(it =>{
+ return this.collectionService.getApiV2CollectionByCollectionIdByStartsWith(this.form.get('mediaCollection').value, it.trim())
+ });
+ forkJoin(obs).subscribe(itemsList => {
+ itemsList.forEach(it => {
+ if(it.length > 0){
+ const type = this.taskType.targetOption === "SINGLE_MEDIA_ITEM" ? ApiTargetType.MEDIA_ITEM : ApiTargetType.MEDIA_ITEM_TEMPORAL_RANGE;
+ this.formBuilder.addTargetForm(this.taskType.targetOption, {type: type, target: it[0].mediaItemId} as ApiTarget)
+ }
+ })
+ })
+ break;
+ case "JUDGEMENT":
+ case "VOTE":
+ console.warn("Cannot batch-add targets for target option JUDGEMENT or VOTE.")
+ break;
+ case "TEXT":
+ const targets = r.map(it => {
+ return {target: it, type: ApiTargetType.TEXT} as ApiTarget
+ });
+ targets.forEach(target => {
+ this.formBuilder.addTargetForm(this.taskType.targetOption, target)
+ })
+ break;
+ }
});
}
diff --git a/frontend/src/app/template/template-builder/components/template-builder-components.module.ts b/frontend/src/app/template/template-builder/components/template-builder-components.module.ts
index 7876c686..7145ab40 100644
--- a/frontend/src/app/template/template-builder/components/template-builder-components.module.ts
+++ b/frontend/src/app/template/template-builder/components/template-builder-components.module.ts
@@ -51,6 +51,7 @@ import { MatCardModule } from "@angular/material/card";
import { ViewersListComponent } from './viewers-list/viewers-list.component';
import { UserListFilterPipe } from './team-builder-dialog/user-list-filter.pipe';
import { UserListInOtherFilterPipe } from './team-builder-dialog/user-list-in-other-filter.pipe';
+import { BatchAddTargetDialogComponent } from './batch-add-target-dialog/batch-add-target-dialog.component';
@NgModule({
@@ -73,7 +74,8 @@ import { UserListInOtherFilterPipe } from './team-builder-dialog/user-list-in-ot
TeamBuilderDialogComponent,
ViewersListComponent,
UserListFilterPipe,
- UserListInOtherFilterPipe
+ UserListInOtherFilterPipe,
+ BatchAddTargetDialogComponent
],
imports: [
CommonModule,
diff --git a/gradle.properties b/gradle.properties
index 4052de18..c8aa7b81 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,9 +12,9 @@ version_clikt=4.1.0
version_fastutil=8.5.12
version_fuel=2.3.1
version_jaffree=2022.06.03
-version_javalin=6.1.3
-version_javalinopenapi=6.1.3
-version_javalinssl=6.1.3
+version_javalin=6.1.6
+version_javalinopenapi=6.1.6
+version_javalinssl=6.1.6
version_jline3=3.22.0
version_junit=5.9.1
version_kotlin=1.8.22