@overmap-ai/core 1.0.38-component-fields.10 → 1.0.38-component-fields.12

package/dist/overmap-core.js

@@ -3241,31 +3241,11 @@ const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
 const selectUserFormMapping = (state) => {
   return state.userFormReducer.userForms;
 };
-const selectFormsForComponentType = restructureCreateSelectorWithArgs(
+const selectComponentTypeForm = restructureCreateSelectorWithArgs(
   createSelector(
     [selectUserFormMapping, (_state, componentTypeId) => componentTypeId],
     (userForms, componentTypeId) => {
-      return Object.values(userForms).filter((userForm) => {
-        return userForm.component_type === componentTypeId;
-      });
-    }
-  )
-);
-const selectLatestRevisionsForComponentTypeForms = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      selectUserFormMapping,
-      selectRevisionMapping,
-      (_state, componentTypeId) => componentTypeId
-    ],
-    (userForms, revisions, componentTypeId) => {
-      const latestRevisions = [];
-      for (const form of Object.values(userForms)) {
-        if (form.component_type === componentTypeId) {
-          latestRevisions.push(_selectLatestFormRevision(revisions, form.offline_id));
-        }
-      }
-      return latestRevisions;
+      return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
     }
   )
 );
@@ -10421,6 +10401,10 @@ const FormBrowser = memo(
     }, [filter, maxResults, ownerFilter]);
     const userForms = useAppSelector(selectFilteredUserForms(ownerFilterOptions)) ?? [];
     const userFormMapping = useAppSelector(selectUserFormMapping);
+    const attachableUserForms = userForms.filter((form) => !form.component_type && !form.component_stage);
+    const attachableUserFormMapping = Object.values(userFormMapping).filter(
+      (form) => !form.component_type && !form.component_stage
+    );
     const handleToggleFavorite = useCallback(
       (form) => {
         if (form.favorite) {
@@ -10434,7 +10418,7 @@ const FormBrowser = memo(
     const options = useMemo(() => {
       const state = sdk.store.getState();
       const accumulator = {};
-      for (const form of Object.values(userFormMapping)) {
+      for (const form of attachableUserFormMapping) {
         const organization = selectOrganization(form.owner_organization || -1)(state);
         if (organization) {
           accumulator[`${orgOptionPrefix}${organization.id}`] = organization.name;
@@ -10445,13 +10429,13 @@ const FormBrowser = memo(
         }
       }
       return Object.entries(accumulator).map(([value, label]) => ({ itemContent: label, value }));
-    }, [userFormMapping, sdk.store]);
+    }, [sdk.store, attachableUserFormMapping]);
     const handleChange = useCallback((e) => {
       setFilter(e.currentTarget.value);
     }, []);
-    const numberOfForms = useAppSelector(selectNumberOfUserForms) || 0;
-    const numberOfHiddenForms = numberOfForms - userForms.length;
-    const overflowMessage = userForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
+    const numberOfForms = useAppSelector(selectNumberOfUserForms) - (userForms.length - attachableUserForms.length);
+    const numberOfHiddenForms = numberOfForms - attachableUserForms.length;
+    const overflowMessage = attachableUserForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
     return /* @__PURE__ */ jsxs(Flex, { ref, direction: "column", gap: "2", children: [
       /* @__PURE__ */ jsxs(Flex, { gap: "2", grow: "1", children: [
         /* @__PURE__ */ jsx(Box, { grow: "1", asChild: true, children: /* @__PURE__ */ jsx(TextField$1.Root, { size: "3", children: /* @__PURE__ */ jsx(TextField$1.Input, { placeholder: "Filter", value: filter, onChange: handleChange }) }) }),
@@ -10466,7 +10450,7 @@ const FormBrowser = memo(
           }
         )
       ] }),
-      userForms.length > 0 && /* @__PURE__ */ jsx(ButtonList.Root, { children: userForms.map((form) => /* @__PURE__ */ jsx(
+      attachableUserForms.length > 0 && /* @__PURE__ */ jsx(ButtonList.Root, { children: attachableUserForms.map((form) => /* @__PURE__ */ jsx(
         FormBrowserEntry,
         {
           ...entryProps,
@@ -12096,6 +12080,7 @@ export {
   selectCompletedStages,
   selectComponent,
   selectComponentType,
+  selectComponentTypeForm,
   selectComponentTypeFromComponent,
   selectComponentTypeFromComponents,
   selectComponentTypes,
@@ -12120,7 +12105,6 @@ export {
   selectFileAttachmentsOfIssue,
   selectFilteredUserForms,
   selectFormRevision,
-  selectFormsForComponentType,
   selectHiddenCategoryCount,
   selectHiddenComponentTypeIds,
   selectIsFetchingInitialData,
@@ -12135,7 +12119,6 @@ export {
   selectLatestRetryTime,
   selectLatestRevisionByFormId,
   selectLatestRevisionsForComponentStageForms,
-  selectLatestRevisionsForComponentTypeForms,
   selectLatestRevisionsFromComponentTypeIds,
   selectMainWorkspace,
   selectMapStyle,