@ironcode/vas-lib 0.0.39 → 0.0.41

package/fesm2015/ironcode-vas-lib.mjs

@@ -684,10 +684,10 @@ class VasFileModel extends VasJobDataModel {
             description: '',
             displayedName: '',
             rotation: 0
-        }, '', '', '', '', '');
+        }, '', '', '', 'NEW', '');
     }
     static fromDto(fileDto) {
-        return new VasFileModel(fileDto.id || UUID.UUID(), fileDto.created || '', fileDto.serverCreated || '', fileDto.createdBy || '', fileDto.modified || '', fileDto.serverModified || '', fileDto.modifiedBy || '', fileDto.account || '', fileDto.job || '', fileDto.name || '', fileDto.fileSize || 0, fileDto.mimeType || '', fileDto.sequence || 0, VasFileModel.parseConfig(fileDto.config), fileDto.url || '', fileDto.controlPath || '', fileDto.message || '', fileDto.status || '', fileDto.uri || '');
+        return new VasFileModel(fileDto.id || UUID.UUID(), fileDto.created || '', fileDto.serverCreated || '', fileDto.createdBy || '', fileDto.modified || '', fileDto.serverModified || '', fileDto.modifiedBy || '', fileDto.account || '', fileDto.job || '', fileDto.name || '', fileDto.fileSize || 0, fileDto.mimeType || '', fileDto.sequence || 0, VasFileModel.parseConfig(fileDto.config), fileDto.url || '', fileDto.controlPath || '', fileDto.message || '', fileDto.status || 'NEW', fileDto.uri || '');
     }
     static parseConfig(config = '') {
         try {
@@ -871,27 +871,7 @@ class VasGroupModel extends VasBaseModel {
  * VasFormModel
  */
 class VasFormModel extends VasRestrictedAccountObjectModel {
-    /**
-     * @param {string} id
-     * @param {string} created
-     * @param {string} serverCreated
-     * @param {string} createdBy
-     * @param {string} modified
-     * @param {string} serverModified
-     * @param {string} modifiedBy
-     * @param {string} account
-     * @param {string} accessGroup
-     * @param {string} jobType
-     * @param {string} title
-     * @param {string} description
-     * @param {VasGroupModel[]} groups
-     * @param {string} dynamicDescriptor
-     * @param {string} indexName
-     * @param {string} pipelineName
-     * @param {string} config
-     * @param {boolean} geoLocationEnabled
-     */
-    constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, account, accessGroup, jobType, title, description, groups, dynamicDescriptor, indexName, pipelineName, config, geoLocationEnabled) {
+    constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, account, accessGroup, jobType, title, description, groups, dynamicDescriptor, indexName, pipelineName, config, geoLocationEnabled, filesEnabled) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, account, accessGroup);
         this.id = id;
         this.created = created;
@@ -911,6 +891,7 @@ class VasFormModel extends VasRestrictedAccountObjectModel {
         this.pipelineName = pipelineName;
         this.config = config;
         this.geoLocationEnabled = geoLocationEnabled;
+        this.filesEnabled = filesEnabled;
     }
     /**
      * Returns the name of this form in a "safe" way, i.e. no spaces, special
@@ -953,7 +934,7 @@ class VasFormModel extends VasRestrictedAccountObjectModel {
     static fromDto(dto) {
         return new VasFormModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.account || '', dto.accessGroup || '', dto.jobType || '', dto.title || '', dto.description || '', (dto.groups || [])
             .sort((a, b) => a.sequence - b.sequence)
-            .map(g => VasGroupModel.fromDto(g)), dto.dynamicDescriptor || '', dto.indexName || '', dto.pipelineName || '', dto.config || '', dto.geoLocationEnabled || false);
+            .map(g => VasGroupModel.fromDto(g)), dto.dynamicDescriptor || '', dto.indexName || '', dto.pipelineName || '', dto.config || '', dto.geoLocationEnabled || false, dto.filesEnabled || false);
     }
     addControlTypesToControl(controlTypes) {
         const controlTypeModels = controlTypes
@@ -1059,7 +1040,8 @@ class VasFormModel extends VasRestrictedAccountObjectModel {
             indexName: this.indexName,
             pipelineName: this.pipelineName,
             config: this.config,
-            geoLocationEnabled: this.geoLocationEnabled
+            geoLocationEnabled: this.geoLocationEnabled,
+            filesEnabled: this.filesEnabled
         };
     }
 }
@@ -1171,6 +1153,10 @@ const getEmptyGeoLocation = () => ({
     timestamp: ''
 });
 
+const isArrayString = (value) => {
+    return Array.isArray(value) && value.every(i => typeof i === 'string');
+};
+
 /**
  * JobModel
  */
@@ -1311,6 +1297,51 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
         }, {});
         return fields;
     }
+    /**
+     * Returns an object describing how many attachments were added to this job
+     * (camera controls and files), and how many have not been uploaded yet.
+     *
+     * @param formModel instance of {@link VasFormModel} that was used when the
+     * job was created
+     */
+    getFilesUploadStatus(formModel) {
+        const pathsWithValue = formModel
+            .getCameraControlPaths()
+            .map(path => {
+            const value = this.getValueByPath(path);
+            if (value && !!value.id) {
+                return path;
+            }
+            return null;
+        })
+            .filter(path => path !== null ? path : null)
+            .filter(isArrayString);
+        let total = pathsWithValue.length;
+        total += this.files.length;
+        // calculate the number of camera images still to upload
+        let pending = pathsWithValue
+            .map(path => this.getValueByPath(path))
+            .map((value) => {
+            if (isFileDto(value)) {
+                return value.id && value.status !== 'COMPLETE';
+            }
+            else if (isCameraControlValueV1(value)) {
+                // if url is not set, it hasn't been uploaded
+                return value.id && !value.url;
+            }
+            return false;
+        })
+            .filter(hasUploaded => hasUploaded)
+            .length;
+        // add total from files that are pending
+        pending += this.files
+            .filter(value => value.status !== 'COMPLETE')
+            .length;
+        return {
+            pending,
+            total
+        };
+    }
     /**
      * This method will hydrate the `fields` property of the model. The reason for
      * this is that we have different ways to store the field data. One way, is
@@ -1420,7 +1451,6 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
         this.fields = fields;
     }
     /**
-  
      * @param {string[]} path path segments
      * @return {void}
      */