Merge pull request #5236 from specify/issue-5222

Hide CollectionObjectType on the frontend
specify · Aug 27, 2024 · d58797e · d58797e
2 parents 226b78e + 8164bf7
commit d58797e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/Fields.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/Fields.tsx
@@ -66,7 +66,15 @@ export function SchemaConfigFields({
 
         {relationships.length > 0 && (
           <optgroup label={schemaText.relationships()}>
-            <SchemaConfigFieldsList fields={relationships} />
+            <SchemaConfigFieldsList
+              fields={
+                table.name === 'CollectionObject'
+                  ? relationships.filter(
+                      ({ name }) => name !== 'collectionObjectType'
+                    )
+                  : relationships
+              }
+            />
           </optgroup>
         )}
       </Select>

diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/TableUniquenessRules.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/TableUniquenessRules.tsx
@@ -71,7 +71,9 @@ export function TableUniquenessRules(): JSX.Element {
         (relationship) =>
           (['many-to-one', 'one-to-one'] as RA<RelationshipType>).includes(
             relationship.type
-          ) && !relationship.isVirtual
+          ) &&
+          !relationship.isVirtual &&
+          relationship.name !== 'collectionObjectType'
       ),
     [table]
   );

diff --git a/specifyweb/frontend/js_src/lib/components/Toolbar/QueryTablesEdit.tsx b/specifyweb/frontend/js_src/lib/components/Toolbar/QueryTablesEdit.tsx
@@ -37,8 +37,12 @@ export function QueryTablesEdit({
     />
   );
 }
-// TODO: temp fix, remove this, use to hide geo tables for COG until 9.8 release
+/*
+ * TODO: temp fix, remove this, use to hide geo tables for COG until 9.8 release
+ * TODO: Revert #5236 to unhide COType
+ */
 export const HIDDEN_GEO_TABLES = new Set([
+  'CollectionObjectType',
   'CollectionObjectGroup',
   'CollectionObjectGroupJoin',
   'CollectionObjectGroupType',

diff --git a/specifyweb/frontend/js_src/lib/components/WbPlanView/LineComponents.tsx b/specifyweb/frontend/js_src/lib/components/WbPlanView/LineComponents.tsx
@@ -228,7 +228,8 @@ export function MappingElement({
   fieldsData,
   ...props
 }: MappingElementProps): JSX.Element {
-  const fieldGroups = Object.entries(fieldsData).reduce<
+  const { collectionObjectType, ...rest } = fieldsData;
+  const fieldGroups = Object.entries(rest).reduce<
     R<R<CustomSelectElementOptionProps>>
   >((fieldGroups, [fieldName, fieldData]) => {
     const groupName = getFieldGroupName(