@overmap-ai/core 1.0.71-fields.1 → 1.0.71-fields.10

package/dist/overmap-core.js

@@ -2104,17 +2104,6 @@ const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping], (revisions) => {
-  const latestRevisions = {};
-  for (const revision of Object.values(revisions)) {
-    const formId = revision.form;
-    const currentLatestRevision = latestRevisions[formId];
-    if (!currentLatestRevision || currentLatestRevision.revision < revision.revision) {
-      latestRevisions[formId] = revision;
-    }
-  }
-  return latestRevisions;
-});
 const formRevisionReducer = formRevisionsSlice.reducer;
 const formAdapter = createModelAdapter((form) => form.offline_id);
 const initialState$n = formAdapter.getInitialState({});
@@ -2139,6 +2128,9 @@ const selectFormMapping = (state) => {
 const selectForms = createSelector([selectFormMapping], (formsMapping) => {
   return Object.values(formsMapping);
 });
+const selectFormById = (formId) => (state) => {
+  return state.formReducer.instances[formId];
+};
 const selectFilteredForms = restructureCreateSelectorWithArgs(
   createSelector(
     [
@@ -2164,15 +2156,6 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual } }
   )
 );
-const selectFormById = (formId) => (state) => {
-  return state.formReducer.instances[formId];
-};
-const selectFormsCount = createSelector([selectFormMapping], (formsMapping) => {
-  return Object.keys(formsMapping).length;
-});
-const selectGeneralFormCount = createSelector([selectFormMapping], (formsMapping) => {
-  return Object.values(formsMapping).length;
-});
 const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
 const initialState$m = submissionAdapter.getInitialState({});
 const formSubmissionSlice = createSlice({
@@ -2234,43 +2217,6 @@ const selectFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectFormSubmissionsByFormRevisions = createSelector([selectFormRevisionMapping, selectFormSubmissions], (revisions, submissions) => {
-  var _a2;
-  const submissionMapping = {};
-  for (const revisionId in revisions) {
-    submissionMapping[revisionId] = [];
-  }
-  for (const submission of submissions) {
-    (_a2 = submissionMapping[submission.form_revision]) == null ? void 0 : _a2.push(submission);
-  }
-  return submissionMapping;
-});
-const selectSortedFormSubmissionsOfForm = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      selectFormRevisionMapping,
-      selectFormSubmissionsByFormRevisions,
-      (_state, formId) => formId
-    ],
-    (revisionsMapping, submissionsByRevision, formId) => {
-      const submissionsByFormRevisions = {};
-      for (const revisionId in revisionsMapping) {
-        const revision = revisionsMapping[revisionId];
-        const submissionsOfRevision = submissionsByRevision[revisionId];
-        if (revision && submissionsOfRevision && revision.form === formId) {
-          submissionsByFormRevisions[revisionId] = submissionsOfRevision.sort(
-            (a, b) => a.submitted_at < b.submitted_at ? -1 : 1
-          );
-        }
-      }
-      return Object.entries(submissionsByFormRevisions).sort((a, b) => {
-        const aRevision = revisionsMapping[a[0]];
-        const bRevision = revisionsMapping[b[0]];
-        return formRevisionSortFn(aRevision, bRevision);
-      }).map(([_revisionId, submissions]) => submissions).flat();
-    }
-  )
-);
 const selectFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
   createSelector(
     [selectFormSubmissions, (_state, issueId) => issueId],
@@ -3038,56 +2984,14 @@ const selectIssueAssociationsOfAsset = restructureCreateSelectorWithArgs(
   )
 );
 const issueAssociationReducer = issueAssociationSlice.reducer;
-const issueTypeFieldsAdapter = createModelAdapter((fields) => fields.offline_id);
-const initialState$7 = issueTypeFieldsAdapter.getInitialState({});
-const issueTypeFieldsSlice = createSlice({
-  name: "issueTypeFields",
-  initialState: initialState$7,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
-  reducers: {
-    initializeIssueTypeFields: issueTypeFieldsAdapter.initialize,
-    addIssueTypeFields: issueTypeFieldsAdapter.addOne,
-    addIssueTypeFieldsMany: issueTypeFieldsAdapter.addMany,
-    setIssueTypeFields: issueTypeFieldsAdapter.setOne,
-    setIssueTypeFieldsMany: issueTypeFieldsAdapter.setMany,
-    updateIssueTypeFields: issueTypeFieldsAdapter.updateOne,
-    updateIssueTypeFieldsMany: issueTypeFieldsAdapter.updateMany,
-    deleteIssueTypeFields: issueTypeFieldsAdapter.deleteOne,
-    deleteIssueTypeFieldsMany: issueTypeFieldsAdapter.deleteMany
-  }
-});
-const {
-  initializeIssueTypeFields,
-  addIssueTypeFields,
-  addIssueTypeFieldsMany,
-  setIssueTypeFields,
-  setIssueTypeFieldsMany,
-  updateIssueTypeFields,
-  updateIssueTypeFieldsMany,
-  deleteIssueTypeFields,
-  deleteIssueTypeFieldsMany
-} = issueTypeFieldsSlice.actions;
-const selectIssueTypeFieldsMapping = (state) => state.issueTypeFieldsReducer.instances;
-const selectIssueTypeFields = createSelector([selectIssueTypeFieldsMapping], (fieldsMapping) => {
-  return Object.values(fieldsMapping);
-});
-const selectIssueTypeFieldsOfIssueType = restructureCreateSelectorWithArgs(
-  createSelector([selectIssueTypeFields, (_state, issueTypeId) => issueTypeId], (fields, issueTypeId) => {
-    return fallbackToEmptyArray(fields.filter((field) => field.issue_type === issueTypeId));
-  })
-);
-const selectIssueTypeFieldsById = (fieldsId) => (state) => {
-  return state.issueTypeFieldsReducer.instances[fieldsId];
-};
-const issueTypeFieldsReducer = issueTypeFieldsSlice.reducer;
 const issueTypeFieldValuesAdapter = createModelAdapter(
   (fieldValues) => fieldValues.offline_id
 );
-const initialState$6 = issueTypeFieldValuesAdapter.getInitialState({});
+const initialState$7 = issueTypeFieldValuesAdapter.getInitialState({});
 const issueTypeFieldValuesSlice = createSlice({
   name: "issueTypeFieldValues",
-  initialState: initialState$6,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  initialState: initialState$7,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
   reducers: {
     initializeIssueTypeFieldValues: issueTypeFieldValuesAdapter.initialize,
     addIssueTypeFieldValues: issueTypeFieldValuesAdapter.addOne,
@@ -3124,6 +3028,64 @@ const selectIssueTypeFieldValuesById = (fieldValuesId) => (state) => {
   return state.issueTypeFieldValuesReducer.instances[fieldValuesId];
 };
 const issueTypeFieldValuesReducer = issueTypeFieldValuesSlice.reducer;
+const issueTypeFieldsAdapter = createModelAdapter((fields) => fields.offline_id);
+const initialState$6 = issueTypeFieldsAdapter.getInitialState({});
+const issueTypeFieldsSlice = createSlice({
+  name: "issueTypeFields",
+  initialState: initialState$6,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  reducers: {
+    initializeIssueTypeFields: issueTypeFieldsAdapter.initialize,
+    addIssueTypeFields: issueTypeFieldsAdapter.addOne,
+    addIssueTypeFieldsMany: issueTypeFieldsAdapter.addMany,
+    setIssueTypeFields: issueTypeFieldsAdapter.setOne,
+    setIssueTypeFieldsMany: issueTypeFieldsAdapter.setMany,
+    updateIssueTypeFields: issueTypeFieldsAdapter.updateOne,
+    updateIssueTypeFieldsMany: issueTypeFieldsAdapter.updateMany,
+    deleteIssueTypeFields: issueTypeFieldsAdapter.deleteOne,
+    deleteIssueTypeFieldsMany: issueTypeFieldsAdapter.deleteMany
+  }
+});
+const {
+  initializeIssueTypeFields,
+  addIssueTypeFields,
+  addIssueTypeFieldsMany,
+  setIssueTypeFields,
+  setIssueTypeFieldsMany,
+  updateIssueTypeFields,
+  updateIssueTypeFieldsMany,
+  deleteIssueTypeFields,
+  deleteIssueTypeFieldsMany
+} = issueTypeFieldsSlice.actions;
+const selectIssueTypeFieldsMapping = (state) => state.issueTypeFieldsReducer.instances;
+const selectIssueTypeFields = createSelector([selectIssueTypeFieldsMapping], (fieldsMapping) => {
+  return Object.values(fieldsMapping);
+});
+const selectIssueTypeFieldsOfIssueType = restructureCreateSelectorWithArgs(
+  createSelector([selectIssueTypeFields, (_state, issueTypeId) => issueTypeId], (fields, issueTypeId) => {
+    return fallbackToEmptyArray(fields.filter((field) => field.issue_type === issueTypeId));
+  })
+);
+const selectLatestIssueTypeFieldsOfIssueType = restructureCreateSelectorWithArgs(
+  createSelector([selectIssueTypeFields, (_state, id) => id], (fields, id) => {
+    return fields.filter((field) => field.issue_type === id).sort((a, b) => a.submitted_at > b.submitted_at ? -1 : 1)[0];
+  })
+);
+const selectIssueTypeValuesOfIssueType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueTypeFields, selectIssueTypeFieldValues, (_state, id) => id],
+    (fields, fieldValues, id) => {
+      const fieldsIds = new Set(
+        fields.filter((field) => field.issue_type === id).map((field) => field.offline_id)
+      );
+      return fallbackToEmptyArray(fieldValues.filter((values) => fieldsIds.has(values.fields_revision)));
+    }
+  )
+);
+const selectIssueTypeFieldsById = (fieldsId) => (state) => {
+  return state.issueTypeFieldsReducer.instances[fieldsId];
+};
+const issueTypeFieldsReducer = issueTypeFieldsSlice.reducer;
 const issueTypeFieldsAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
@@ -3264,6 +3226,11 @@ const selectAssetTypeFieldsOfAssetType = restructureCreateSelectorWithArgs(
     return fallbackToEmptyArray(fields.filter((field) => field.asset_type === assetTypeId));
   })
 );
+const selectLatestAssetTypeFieldsOfAssetType = restructureCreateSelectorWithArgs(
+  createSelector([selectAssetTypeFields, (_state, id) => id], (fields, id) => {
+    return fields.filter((field) => field.asset_type === id).sort((a, b) => a.submitted_at > b.submitted_at ? -1 : 1)[0];
+  })
+);
 const selectAssetTypeFieldsById = (fieldsId) => (state) => {
   return state.assetTypeFieldsReducer.instances[fieldsId];
 };
@@ -3308,6 +3275,17 @@ const selectAssetTypeFieldValuesOfAsset = restructureCreateSelectorWithArgs(
     return fallbackToEmptyArray(fieldValues.filter((fieldValue) => fieldValue.asset === assetId));
   })
 );
+const selectAssetTypeValuesOfAssetType = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectAssetTypeFields, selectAssetTypeFieldValues, (_state, id) => id],
+    (fields, fieldValues, id) => {
+      const fieldsIds = new Set(
+        fields.filter((field) => field.asset_type === id).map((field) => field.offline_id)
+      );
+      return fallbackToEmptyArray(fieldValues.filter((values) => fieldsIds.has(values.fields_revision)));
+    }
+  )
+);
 const selectAssetTypeFieldValuesById = (fieldValuesId) => (state) => {
   return state.assetTypeFieldValuesReducer.instances[fieldValuesId];
 };
@@ -5299,15 +5277,7 @@ class IssueTypeService extends BaseApiService {
     const promise = this.enqueueRequest({
       method: HttpMethod.POST,
       url: "/issue-types/",
-      // Sending only whats needed here
-      payload: {
-        offline_id: offlineIssueType.offline_id,
-        submitted_at: offlineIssueType.submitted_at,
-        icon: offlineIssueType.icon,
-        color: offlineIssueType.color,
-        name: offlineIssueType.name,
-        description: offlineIssueType.description
-      },
+      payload: offlineIssueType,
       blockers: [],
       blocks: [offlineIssueType.offline_id]
     });
@@ -7594,24 +7564,39 @@ class AssetTypeFieldValuesService extends BaseApiService {
     return [offlineAssetTypeFieldValues, promise];
   }
   bulkAdd(payload, batchSize) {
+    var _a2;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const { values } = separateFilesFromValues(payload.values);
-    const payloadsBatches = chunkArray(payload.payloads, batchSize);
-    const bulkAddPayloads = payloadsBatches.map((batch) => {
-      return {
+    const offlineAssetTypeFieldValuesMany = [];
+    const batches = chunkArray(payload.payloads, batchSize ?? payload.payloads.length);
+    const batchPayloads = [];
+    for (const batch of batches) {
+      const assetTypeFieldValuesPayloads = [];
+      for (const payload2 of batch) {
+        const offlineAssetTypeFieldValues = offline({
+          ...payload2,
+          values: separateFilesFromValues(payload2.values).values,
+          created_by: (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id,
+          submitted_at: submittedAt
+        });
+        offlineAssetTypeFieldValuesMany.push(offlineAssetTypeFieldValues);
+        assetTypeFieldValuesPayloads.push({
+          offline_id: offlineAssetTypeFieldValues.offline_id,
+          asset: payload2.asset,
+          fields_revision: payload2.fields_revision,
+          published_at: payload2.published_at,
+          values: offlineAssetTypeFieldValues.values
+        });
+      }
+      batchPayloads.push({
         submitted_at: submittedAt,
         values,
-        field_values: batch.map((payload2) => {
-          const { values: values2 } = separateFilesFromValues(payload2.values);
-          return offline({
-            ...payload2,
-            values: values2
-          });
-        })
-      };
-    });
+        field_values: assetTypeFieldValuesPayloads
+      });
+    }
+    this.dispatch(addAssetTypeFieldValuesMany(offlineAssetTypeFieldValuesMany));
     const promises = [];
-    for (const payload2 of bulkAddPayloads) {
+    for (const payload2 of batchPayloads) {
       const assetIds = payload2.field_values.map((x) => x.asset);
       const assetTypeFieldsIds = payload2.field_values.map((x) => x.fields_revision);
       const assetTypeFieldValuesIds = payload2.field_values.map((x) => x.offline_id);
@@ -7626,9 +7611,11 @@ class AssetTypeFieldValuesService extends BaseApiService {
       promises.push(promise);
     }
     void Promise.all(promises).then((results) => {
-      this.dispatch(addAssetTypeFieldValuesMany(results.flat()));
+      this.dispatch(updateAssetTypeFieldValuesMany(results.flat()));
+    }).catch(() => {
+      this.dispatch(deleteAssetTypeFieldValuesMany(offlineAssetTypeFieldValuesMany.map((x) => x.offline_id)));
     });
-    return promises;
+    return [offlineAssetTypeFieldValuesMany, promises];
   }
   update(payload) {
     const { store } = this.client;
@@ -7652,7 +7639,13 @@ class AssetTypeFieldValuesService extends BaseApiService {
       description: "Delete asset type field values",
       method: HttpMethod.PATCH,
       url: `/asset-type-field-values/${payload.offline_id}/`,
-      payload,
+      payload: {
+        ...payload,
+        values: {
+          ...assetTypeFieldValues.values,
+          ...values
+        }
+      },
       blockers: [
         updatedAssetTypeFieldValues.offline_id,
         updatedAssetTypeFieldValues.fields_revision,
@@ -7706,54 +7699,63 @@ class AssetTypeFieldValuesService extends BaseApiService {
   }
 }
 class AssetTypeFieldValuesAttachmentService extends BaseUploadService {
-  async bulkAdd(payloads) {
+  async bulkAdd(payloads, batchSize) {
     var _a2;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const createdBy = (_a2 = this.client.store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
-    const filePayloads = {};
+    const batches = chunkArray(payloads, batchSize ?? payloads.length);
     const offlineAssetTypeFieldValuesAttachments = [];
-    const attachmentPayloads = [];
-    for (const payload of payloads) {
-      const { fieldValuesId, fieldIdentifier, file } = payload;
-      const filePayload = await this.getFilePayload(file);
-      if (!(filePayload.sha1 in filePayloads))
-        filePayloads[filePayload.sha1] = filePayload;
-      const offlineAssetTypeFieldValuesAttachment = offline({
-        file: URL.createObjectURL(file),
-        file_type: file.type,
-        file_name: file.name,
-        file_sha1: filePayload.sha1,
-        created_by: createdBy,
-        field_values: fieldValuesId,
+    const batchPayloads = [];
+    for (const batch of batches) {
+      const filePayloads = {};
+      const attachmentPayloads = [];
+      for (const payload of batch) {
+        const { fieldValuesId, fieldIdentifier, file } = payload;
+        const filePayload = await this.getFilePayload(file);
+        if (!(filePayload.sha1 in filePayloads))
+          filePayloads[filePayload.sha1] = filePayload;
+        const offlineAssetTypeFieldValuesAttachment = offline({
+          file: URL.createObjectURL(file),
+          file_type: file.type,
+          file_name: file.name,
+          file_sha1: filePayload.sha1,
+          created_by: createdBy,
+          field_values: fieldValuesId,
+          submitted_at: submittedAt,
+          field_identifier: fieldIdentifier
+        });
+        offlineAssetTypeFieldValuesAttachments.push(offlineAssetTypeFieldValuesAttachment);
+        const attachmentPayload = {
+          offline_id: offlineAssetTypeFieldValuesAttachment.offline_id,
+          file_name: file.name,
+          file_sha1: filePayload.sha1,
+          file_extension: filePayload.extension,
+          field_identifier: fieldIdentifier,
+          field_values: fieldValuesId
+        };
+        attachmentPayloads.push(attachmentPayload);
+      }
+      batchPayloads.push({
         submitted_at: submittedAt,
-        field_identifier: fieldIdentifier
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
       });
-      offlineAssetTypeFieldValuesAttachments.push(offlineAssetTypeFieldValuesAttachment);
-      const attachmentPayload = {
-        offline_id: offlineAssetTypeFieldValuesAttachment.offline_id,
-        file_name: file.name,
-        file_sha1: filePayload.sha1,
-        file_extension: filePayload.extension,
-        field_identifier: fieldIdentifier,
-        field_values: fieldValuesId
-      };
-      attachmentPayloads.push(attachmentPayload);
     }
     this.dispatch(addAssetTypeFieldValuesAttachments(offlineAssetTypeFieldValuesAttachments));
-    const promise = this.enqueueRequest({
-      description: "Add asset type field values attachments",
-      method: HttpMethod.POST,
-      url: "/asset-type-field-values-attachments/bulk/",
-      payload: {
-        submitted_at: submittedAt,
-        attachments: attachmentPayloads,
-        files: Object.values(filePayloads)
-      },
-      blockers: offlineAssetTypeFieldValuesAttachments.map((attachment) => attachment.field_values),
-      blocks: offlineAssetTypeFieldValuesAttachments.map((attachment) => attachment.offline_id)
+    const promises = batchPayloads.map((payload) => {
+      return this.enqueueRequest({
+        description: "Add asset type field values attachments",
+        method: HttpMethod.POST,
+        url: "/asset-type-field-values-attachments/bulk/",
+        payload,
+        blockers: payload.attachments.map((payload2) => payload2.field_values),
+        blocks: payload.attachments.map((payload2) => payload2.offline_id)
+      });
     });
-    promise.then(({ presigned_urls, attachments }) => {
-      this.processPresignedUrls(presigned_urls);
+    Promise.all(promises).then((result) => {
+      for (const res of result)
+        this.processPresignedUrls(res.presigned_urls);
+      const attachments = result.flatMap((res) => res.attachments);
       this.dispatch(updateAssetTypeFieldValuesAttachments(attachments));
     }).catch((error) => {
       this.dispatch(
@@ -7763,7 +7765,10 @@ class AssetTypeFieldValuesAttachmentService extends BaseUploadService {
       );
       throw error;
     });
-    return [offlineAssetTypeFieldValuesAttachments, promise.then(({ attachments }) => attachments)];
+    return [
+      offlineAssetTypeFieldValuesAttachments,
+      promises.map((promise) => promise.then(({ attachments }) => attachments))
+    ];
   }
   async bulkDelete(ids) {
     const { store } = this.client;
@@ -7786,7 +7791,7 @@ class AssetTypeFieldValuesAttachmentService extends BaseUploadService {
   }
   async refreshStore(projectId) {
     const result = await this.enqueueRequest({
-      description: "Gfet asset type field values attachments",
+      description: "Get asset type field values attachments",
       method: HttpMethod.GET,
       url: "/asset-type-field-values-attachments/",
       queryParams: {
@@ -8057,7 +8062,13 @@ class IssueTypeFieldValuesService extends BaseApiService {
       description: "Update issue type field values",
       method: HttpMethod.PATCH,
       url: `/issue-type-field-values/${payload.offline_id}/`,
-      payload,
+      payload: {
+        ...payload,
+        values: {
+          ...issueTypeFieldValues.values,
+          ...values
+        }
+      },
       blockers: [
         updatedIssueTypeFieldValues.offline_id,
         updatedIssueTypeFieldValues.fields_revision,
@@ -8539,6 +8550,7 @@ export {
   selectAssetTypeFieldsMapping,
   selectAssetTypeFieldsOfAssetType,
   selectAssetTypeStagesMapping,
+  selectAssetTypeValuesOfAssetType,
   selectAssetTypes,
   selectAssetTypesByIds,
   selectAssetTypesMapping,
@@ -8596,14 +8608,11 @@ export {
   selectFormSubmissionAttachmentsMapping,
   selectFormSubmissionById,
   selectFormSubmissions,
-  selectFormSubmissionsByFormRevisions,
   selectFormSubmissionsMapping,
   selectFormSubmissionsOfAsset,
   selectFormSubmissionsOfForm,
   selectFormSubmissionsOfIssue,
   selectForms,
-  selectFormsCount,
-  selectGeneralFormCount,
   selectGeoImageById,
   selectGeoImageMapping,
   selectGeoImages,
@@ -8640,6 +8649,7 @@ export {
   selectIssueTypeFieldsMapping,
   selectIssueTypeFieldsOfIssueType,
   selectIssueTypeMapping,
+  selectIssueTypeValuesOfIssueType,
   selectIssueTypes,
   selectIssueTypesByIds,
   selectIssueTypesOfOrganization,
@@ -8648,8 +8658,9 @@ export {
   selectIssuesByIds,
   selectIssuesOfIssueType,
   selectIssuesOfIssueTypeCount,
-  selectLatestFormRevisionByForm,
+  selectLatestAssetTypeFieldsOfAssetType,
   selectLatestFormRevisionOfForm,
+  selectLatestIssueTypeFieldsOfIssueType,
   selectLatestRetryTime,
   selectLicense,
   selectLicenseForProject,
@@ -8686,7 +8697,6 @@ export {
   selectProjectsOfOrganization,
   selectRehydrated,
   selectRootDocuments,
-  selectSortedFormSubmissionsOfForm,
   selectSortedOrganizationUsers,
   selectSortedProjectUsers,
   selectStageFormIdsFromStageIds,