feat(file value uploads): use upload from for file value types

package.json

@@ -31,7 +31,7 @@
     "@angular/platform-browser-dynamic": "~9.1.12",
     "@angular/router": "~9.1.12",
     "@ckeditor/ckeditor5-angular": "^1.2.3",
-    "@dasch-swiss/dsp-js": "^1.1.0",
+    "@dasch-swiss/dsp-js": "^1.2.0",
     "@dasch-swiss/dsp-ui": "^1.1.1",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",

src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts

@@ -18,11 +18,7 @@ import {
     StoredProject,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import {
-    DspApiConnectionToken,
-    Session,
-    SessionService
-} from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { Subscription } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
@@ -160,6 +156,17 @@ export class ResourceInstanceFormComponent implements OnInit, OnDestroy {
 
             createResource.properties = this.propertiesObj;
 
+            // check for file values
+            if (this.selectPropertiesComponent.hasFileValue.length === 1) {
+
+                const fileValue = this.selectPropertiesComponent.uploadFileComponent.getNewValue();
+
+                if (fileValue instanceof CreateValue) {
+                    createResource.properties[this.selectPropertiesComponent.hasFileValue[0].id] = [fileValue];
+                }
+
+            }
+
             this._dspApiConnection.v2.res.createResource(createResource).subscribe(
                 (res: ReadResource) => {
                     this.resource = res;

src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.html

@@ -1,5 +1,10 @@
 <div class="properties-container">
     <div class="properties">
+
+        <div *ngIf="hasFileValue?.length > 0">
+            <dsp-upload-file #upload [representation]="hasFileValue[0].objectType" [parentForm]="parentForm"></dsp-upload-file>
+        </div>
+
         <div *ngFor="let prop of properties; let last = last;" [class.border-bottom]="!last">
             <div class="property" *ngIf="!prop.isLinkProperty || prop">
                 <div class="property-label">

src/app/workspace/resource/resource-instance-form/select-properties/select-properties.component.ts

@@ -1,7 +1,7 @@
-import { AfterViewInit, Component, Input, OnInit, QueryList, ViewChildren } from '@angular/core';
+import { AfterViewInit, Component, Input, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { Cardinality, CardinalityUtil, IHasProperty, ReadResource, ResourceClassAndPropertyDefinitions, ResourceClassDefinition, ResourcePropertyDefinition } from '@dasch-swiss/dsp-js';
-import { ValueService } from '@dasch-swiss/dsp-ui';
+import { Cardinality, CardinalityUtil, Constants, IHasProperty, ReadResource, ResourceClassAndPropertyDefinitions, ResourceClassDefinition, ResourcePropertyDefinition } from '@dasch-swiss/dsp-js';
+import { UploadFileComponent, ValueService } from '@dasch-swiss/dsp-ui';
 import { SwitchPropertiesComponent } from './switch-properties/switch-properties.component';
 
 @Component({
@@ -11,6 +11,8 @@ import { SwitchPropertiesComponent } from './switch-properties/switch-properties
 })
 export class SelectPropertiesComponent implements OnInit {
 
+    @ViewChild('upload') uploadFileComponent?: UploadFileComponent;
+
     @ViewChildren('switchProp') switchPropertiesComponent: QueryList<SwitchPropertiesComponent>;
 
     @Input() properties: ResourcePropertyDefinition[];
@@ -31,9 +33,14 @@ export class SelectPropertiesComponent implements OnInit {
 
     isRequiredProp: boolean;
 
+    hasFileValue: ResourcePropertyDefinition[] = [];
+
     constructor(private _valueService: ValueService) { }
 
     ngOnInit() {
+
+        this.hasFileValue = this._hasBinaryRepresentation(this.properties);
+
         if (this.properties) {
             for (const prop of this.properties) {
                 if (prop) {
@@ -139,4 +146,28 @@ export class SelectPropertiesComponent implements OnInit {
         return arrayToFilter;
 
     }
+
+    /**
+     *
+     * Determines whether the selected resource class has a binary Representation (image etc.).
+     *
+     * Returns the file value type or an empty array.
+     *
+     * @param properties the properties to check for binary file value types.
+     */
+    private _hasBinaryRepresentation(properties: ResourcePropertyDefinition[]): ResourcePropertyDefinition[] {
+
+        const binaryTypes = [Constants.StillImageFileValue, Constants.AudioFileValue, Constants.DocumentFileValue, Constants.MovingImageFileValue];
+
+        // remove file value properties from property list
+        this.properties = properties.filter(
+            prop => !binaryTypes.includes(prop.objectType)
+        );
+
+        // return the file value property, if any
+        return properties.filter(
+            prop => binaryTypes.includes(prop.objectType)
+        );
+
+    }
 }

src/config/config.dev.json

@@ -4,5 +4,6 @@
     "apiPort": 3333,
     "apiPath": "",
     "jsonWebToken": "",
-    "logErrors": true
+    "logErrors": true,
+    "sipiUrl": "http://localhost:1024/"
 }

src/config/config.prod.json

@@ -4,5 +4,6 @@
     "apiPort": 443,
     "apiPath": "",
     "jsonWebToken": "",
-    "logErrors": false
+    "logErrors": false,
+    "sipiUrl": "http://localhost:1024/"
 }