@overmap-ai/core 1.0.48-bulk-form-submission.0 → 1.0.48-bulk-form-submission.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/overmap-core.js +33 -35
- package/dist/overmap-core.js.map +1 -1
- package/dist/overmap-core.umd.cjs +33 -35
- package/dist/overmap-core.umd.cjs.map +1 -1
- package/dist/store/slices/categorySlice.d.ts +1 -1
- package/dist/store/slices/documentSlice.d.ts +1 -1
- package/dist/store/slices/formRevisionSlice.d.ts +2 -2
- package/dist/store/slices/{userFormSlice.d.ts → formSlice.d.ts} +15 -15
- package/dist/store/slices/index.d.ts +1 -1
- package/dist/store/slices/issueSlice.d.ts +1 -1
- package/dist/store/slices/projectFileSlice.d.ts +1 -1
- package/dist/store/slices/workspaceSlice.d.ts +1 -1
- package/dist/store/store.d.ts +3 -3
- package/package.json +1 -1
package/dist/overmap-core.js
CHANGED
|
@@ -3557,7 +3557,7 @@ const selectFormRevisions = createSelector(
|
|
|
3557
3557
|
[selectFormRevisionMapping],
|
|
3558
3558
|
(formRevisions) => Object.values(formRevisions)
|
|
3559
3559
|
);
|
|
3560
|
-
const
|
|
3560
|
+
const selectFormRevision = (formRevisionId) => (state) => {
|
|
3561
3561
|
return state.formRevisionReducer.formRevisions[formRevisionId];
|
|
3562
3562
|
};
|
|
3563
3563
|
const _selectLatestFormRevision = (formRevisions, formId2) => {
|
|
@@ -3590,7 +3590,7 @@ const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
|
|
|
3590
3590
|
const selectLatestFormRevisionsOfComponentTypes = restructureCreateSelectorWithArgs(
|
|
3591
3591
|
createSelector(
|
|
3592
3592
|
[
|
|
3593
|
-
|
|
3593
|
+
(state) => state.formReducer.forms,
|
|
3594
3594
|
selectFormRevisionMapping,
|
|
3595
3595
|
(_state, componentTypeIds) => componentTypeIds
|
|
3596
3596
|
],
|
|
@@ -3632,8 +3632,8 @@ const formRevisionReducer = formRevisionsSlice.reducer;
|
|
|
3632
3632
|
const initialState$4 = {
|
|
3633
3633
|
forms: {}
|
|
3634
3634
|
};
|
|
3635
|
-
const
|
|
3636
|
-
name: "
|
|
3635
|
+
const formSlice = createSlice({
|
|
3636
|
+
name: "forms",
|
|
3637
3637
|
initialState: initialState$4,
|
|
3638
3638
|
extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
|
|
3639
3639
|
reducers: {
|
|
@@ -3672,11 +3672,11 @@ const userFormSlice = createSlice({
|
|
|
3672
3672
|
}
|
|
3673
3673
|
}
|
|
3674
3674
|
});
|
|
3675
|
-
const { setForms, addForm, addForms, favoriteForm, unfavoriteForm, deleteForm } =
|
|
3676
|
-
const
|
|
3675
|
+
const { setForms, addForm, addForms, favoriteForm, unfavoriteForm, deleteForm } = formSlice.actions;
|
|
3676
|
+
const selectFilteredForms = restructureCreateSelectorWithArgs(
|
|
3677
3677
|
createSelector(
|
|
3678
3678
|
[
|
|
3679
|
-
(state) => state.
|
|
3679
|
+
(state) => state.formReducer.forms,
|
|
3680
3680
|
(state) => state.formRevisionReducer.formRevisions,
|
|
3681
3681
|
(_state, search) => search
|
|
3682
3682
|
],
|
|
@@ -3711,27 +3711,27 @@ const selectFilteredUserForms = restructureCreateSelectorWithArgs(
|
|
|
3711
3711
|
{ memoizeOptions: { equalityCheck: shallowEqual$1 } }
|
|
3712
3712
|
)
|
|
3713
3713
|
);
|
|
3714
|
-
const
|
|
3715
|
-
return state.
|
|
3714
|
+
const selectForm = (formId2) => (state) => {
|
|
3715
|
+
return state.formReducer.forms[formId2];
|
|
3716
3716
|
};
|
|
3717
|
-
const
|
|
3718
|
-
return state.
|
|
3717
|
+
const selectFormMapping = (state) => {
|
|
3718
|
+
return state.formReducer.forms;
|
|
3719
3719
|
};
|
|
3720
|
-
const
|
|
3720
|
+
const selectFormOfComponentType = restructureCreateSelectorWithArgs(
|
|
3721
3721
|
createSelector(
|
|
3722
|
-
[
|
|
3722
|
+
[selectFormMapping, (_state, componentTypeId) => componentTypeId],
|
|
3723
3723
|
(userForms, componentTypeId) => {
|
|
3724
3724
|
return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
|
|
3725
3725
|
}
|
|
3726
3726
|
)
|
|
3727
3727
|
);
|
|
3728
|
-
const
|
|
3728
|
+
const selectFormsCount = createSelector([selectFormMapping], (userForms) => {
|
|
3729
3729
|
return Object.keys(userForms).length;
|
|
3730
3730
|
});
|
|
3731
|
-
const
|
|
3731
|
+
const selectGeneralFormCount = createSelector([selectFormMapping], (userForms) => {
|
|
3732
3732
|
return Object.values(userForms).filter((form) => !form.component_type).length;
|
|
3733
3733
|
});
|
|
3734
|
-
const
|
|
3734
|
+
const formReducer = formSlice.reducer;
|
|
3735
3735
|
const initialState$3 = {
|
|
3736
3736
|
formSubmissions: {},
|
|
3737
3737
|
attachments: {}
|
|
@@ -4173,7 +4173,7 @@ const overmapReducers = {
|
|
|
4173
4173
|
projectFileReducer,
|
|
4174
4174
|
rehydratedReducer,
|
|
4175
4175
|
settingReducer,
|
|
4176
|
-
|
|
4176
|
+
formReducer,
|
|
4177
4177
|
formRevisionReducer,
|
|
4178
4178
|
formSubmissionReducer,
|
|
4179
4179
|
userReducer,
|
|
@@ -4228,9 +4228,7 @@ function handleWorkspaceRemoval(draft, action) {
|
|
|
4228
4228
|
throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
|
|
4229
4229
|
}
|
|
4230
4230
|
}
|
|
4231
|
-
const indexedForms = Object.values(draft.
|
|
4232
|
-
(form) => form.index_workspace === workspaceId
|
|
4233
|
-
);
|
|
4231
|
+
const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
|
|
4234
4232
|
for (const form of indexedForms) {
|
|
4235
4233
|
form.index_workspace = mainWorkspace.offline_id;
|
|
4236
4234
|
}
|
|
@@ -7013,7 +7011,7 @@ class UserFormService extends BaseApiService {
|
|
|
7013
7011
|
async delete(formId2) {
|
|
7014
7012
|
const { store } = this.client;
|
|
7015
7013
|
const state = store.getState();
|
|
7016
|
-
const userForm =
|
|
7014
|
+
const userForm = selectForm(formId2)(state);
|
|
7017
7015
|
if (!userForm) {
|
|
7018
7016
|
throw new Error("Expected userForm to exist");
|
|
7019
7017
|
}
|
|
@@ -14203,7 +14201,7 @@ const FormRenderer = memo(
|
|
|
14203
14201
|
const FormSubmissionViewer = memo(
|
|
14204
14202
|
forwardRef((props, ref) => {
|
|
14205
14203
|
const { submission, showFormDescription = false, showFormTitle = true } = props;
|
|
14206
|
-
const revision = useAppSelector(
|
|
14204
|
+
const revision = useAppSelector(selectFormRevision(submission.form_revision));
|
|
14207
14205
|
const { sdk } = useSDK();
|
|
14208
14206
|
if (!revision) {
|
|
14209
14207
|
throw new Error(
|
|
@@ -14268,8 +14266,8 @@ const FormBrowser = memo(
|
|
|
14268
14266
|
}
|
|
14269
14267
|
return ret;
|
|
14270
14268
|
}, [filter, maxResults, ownerFilter]);
|
|
14271
|
-
const userForms = useAppSelector(
|
|
14272
|
-
const userFormMapping = useAppSelector(
|
|
14269
|
+
const userForms = useAppSelector(selectFilteredForms(ownerFilterOptions)) ?? [];
|
|
14270
|
+
const userFormMapping = useAppSelector(selectFormMapping);
|
|
14273
14271
|
const attachableUserForms = userForms.filter((form) => !form.component_type);
|
|
14274
14272
|
const attachableUserFormMapping = Object.values(userFormMapping).filter(
|
|
14275
14273
|
(form) => !form.component_type
|
|
@@ -14302,7 +14300,7 @@ const FormBrowser = memo(
|
|
|
14302
14300
|
const handleChange = useCallback((e) => {
|
|
14303
14301
|
setFilter(e.currentTarget.value);
|
|
14304
14302
|
}, []);
|
|
14305
|
-
const numberOfForms = useAppSelector(
|
|
14303
|
+
const numberOfForms = useAppSelector(selectGeneralFormCount) || 0;
|
|
14306
14304
|
const numberOfHiddenForms = numberOfForms - attachableUserForms.length;
|
|
14307
14305
|
const overflowMessage = attachableUserForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
|
|
14308
14306
|
return /* @__PURE__ */ jsxs(Flex$1, { ref, direction: "column", gap: "2", children: [
|
|
@@ -14398,7 +14396,7 @@ const FormSubmissionBrowserEntry = memo((props) => {
|
|
|
14398
14396
|
const createdBy = useAppSelector(selectUser("created_by" in submission ? submission.created_by : currentUser.id));
|
|
14399
14397
|
const dateToUse = submission.submitted_at;
|
|
14400
14398
|
const formattedDateTime = getLocalDateString(dateToUse);
|
|
14401
|
-
const revision = useAppSelector(
|
|
14399
|
+
const revision = useAppSelector(selectFormRevision(submission.form_revision));
|
|
14402
14400
|
if (!revision) {
|
|
14403
14401
|
throw new Error(`Could not find revision ${submission.form_revision} for submission ${submission.offline_id}.`);
|
|
14404
14402
|
}
|
|
@@ -15881,9 +15879,11 @@ export {
|
|
|
15881
15879
|
fileSlice,
|
|
15882
15880
|
fileToBlob,
|
|
15883
15881
|
flipCoordinates,
|
|
15882
|
+
formReducer,
|
|
15884
15883
|
formRevisionReducer,
|
|
15885
15884
|
formRevisionToSchema,
|
|
15886
15885
|
formRevisionsSlice,
|
|
15886
|
+
formSlice,
|
|
15887
15887
|
formSubmissionReducer,
|
|
15888
15888
|
formSubmissionSlice,
|
|
15889
15889
|
index as forms,
|
|
@@ -16028,7 +16028,6 @@ export {
|
|
|
16028
16028
|
selectComponentAttachmentMapping,
|
|
16029
16029
|
selectComponentType,
|
|
16030
16030
|
selectComponentTypeAttachmentMapping,
|
|
16031
|
-
selectComponentTypeForm,
|
|
16032
16031
|
selectComponentTypeFromComponent,
|
|
16033
16032
|
selectComponentTypeFromComponents,
|
|
16034
16033
|
selectComponentTypeStagesMapping,
|
|
@@ -16056,7 +16055,11 @@ export {
|
|
|
16056
16055
|
selectExpandedSections,
|
|
16057
16056
|
selectFavouriteProjects,
|
|
16058
16057
|
selectFileAttachmentsOfIssue,
|
|
16059
|
-
|
|
16058
|
+
selectFilteredForms,
|
|
16059
|
+
selectForm,
|
|
16060
|
+
selectFormMapping,
|
|
16061
|
+
selectFormOfComponentType,
|
|
16062
|
+
selectFormRevision,
|
|
16060
16063
|
selectFormRevisionMapping,
|
|
16061
16064
|
selectFormRevisions,
|
|
16062
16065
|
selectFormRevisionsOfForm,
|
|
@@ -16068,6 +16071,8 @@ export {
|
|
|
16068
16071
|
selectFormSubmissionsOfComponent,
|
|
16069
16072
|
selectFormSubmissionsOfForm,
|
|
16070
16073
|
selectFormSubmissionsOfIssue,
|
|
16074
|
+
selectFormsCount,
|
|
16075
|
+
selectGeneralFormCount,
|
|
16071
16076
|
selectHiddenCategoryCount,
|
|
16072
16077
|
selectHiddenComponentTypeIds,
|
|
16073
16078
|
selectIsFetchingInitialData,
|
|
@@ -16093,8 +16098,6 @@ export {
|
|
|
16093
16098
|
selectMapStyle,
|
|
16094
16099
|
selectNumberOfComponentTypesMatchingCaseInsensitiveName,
|
|
16095
16100
|
selectNumberOfComponentsOfComponentType,
|
|
16096
|
-
selectNumberOfGeneralUserForms,
|
|
16097
|
-
selectNumberOfUserForms,
|
|
16098
16101
|
selectOrganization,
|
|
16099
16102
|
selectOrganizationAccess,
|
|
16100
16103
|
selectOrganizationAccessForUser,
|
|
@@ -16139,9 +16142,6 @@ export {
|
|
|
16139
16142
|
selectUploadUrl,
|
|
16140
16143
|
selectUsedColors,
|
|
16141
16144
|
selectUser,
|
|
16142
|
-
selectUserForm,
|
|
16143
|
-
selectUserFormMapping,
|
|
16144
|
-
selectUserFormRevision,
|
|
16145
16145
|
selectUserFormRevisionAttachmentsMapping,
|
|
16146
16146
|
selectUsersAsMapping,
|
|
16147
16147
|
selectVisibleStatuses,
|
|
@@ -16241,8 +16241,6 @@ export {
|
|
|
16241
16241
|
useFormikInput,
|
|
16242
16242
|
useMemoCompare,
|
|
16243
16243
|
useSDK,
|
|
16244
|
-
userFormReducer,
|
|
16245
|
-
userFormSlice,
|
|
16246
16244
|
userReducer,
|
|
16247
16245
|
userSlice,
|
|
16248
16246
|
valueIsFile,
|