diff --git a/specifyweb/context/schema_localization.py b/specifyweb/context/schema_localization.py index 4c1b422ecc2..2509a0ceba5 100644 --- a/specifyweb/context/schema_localization.py +++ b/specifyweb/context/schema_localization.py @@ -117,7 +117,7 @@ def get_schema_localization(collection, schematype, lang): cfields = ('format', 'ishidden', 'isuiformatter', 'picklistname', 'type', 'aggregator', 'defaultui', 'name', 'desc') containers = { - row[0]: dict(items={}, **{field: row[i+1] for i, field in enumerate(cfields)}) + row[0].lower(): dict(items={}, **{field: row[i+1] for i, field in enumerate(cfields)}) for row in cursor.fetchall() } @@ -172,7 +172,7 @@ def get_schema_localization(collection, schematype, lang): ifields = ('format', 'ishidden', 'isuiformatter', 'picklistname', 'type', 'isrequired', 'weblinkname', 'name', 'desc') for row in cursor.fetchall(): - containers[row[0]]['items'][row[1].lower()] = {field: row[i+2] for i, field in enumerate(ifields)} + containers[row[0].lower()]['items'][row[1].lower()] = {field: row[i+2] for i, field in enumerate(ifields)} return containers diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/Fields.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/Fields.tsx index bbe118b1884..af860fcb76f 100644 --- a/specifyweb/frontend/js_src/lib/components/SchemaConfig/Fields.tsx +++ b/specifyweb/frontend/js_src/lib/components/SchemaConfig/Fields.tsx @@ -66,15 +66,7 @@ export function SchemaConfigFields({ {relationships.length > 0 && ( - name !== 'collectionObjectType' - ) - : relationships - } - /> + )} diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/TableUniquenessRules.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/TableUniquenessRules.tsx index b2334201c4e..8b6d783d5ee 100644 --- a/specifyweb/frontend/js_src/lib/components/SchemaConfig/TableUniquenessRules.tsx +++ b/specifyweb/frontend/js_src/lib/components/SchemaConfig/TableUniquenessRules.tsx @@ -71,9 +71,7 @@ export function TableUniquenessRules(): JSX.Element { (relationship) => (['many-to-one', 'one-to-one'] as RA).includes( relationship.type - ) && - !relationship.isVirtual && - relationship.name !== 'collectionObjectType' + ) && !relationship.isVirtual ), [table] ); diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/Tables.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/Tables.tsx index 276956a0286..1edf5436416 100644 --- a/specifyweb/frontend/js_src/lib/components/SchemaConfig/Tables.tsx +++ b/specifyweb/frontend/js_src/lib/components/SchemaConfig/Tables.tsx @@ -21,7 +21,6 @@ import { Dialog } from '../Molecules/Dialog'; import { TableIcon } from '../Molecules/TableIcon'; import { hasTablePermission } from '../Permissions/helpers'; import { formatUrl } from '../Router/queryString'; -import { HIDDEN_GEO_TABLES } from '../Toolbar/QueryTablesEdit'; export function SchemaConfigTables(): JSX.Element { const { language = '' } = useParams(); @@ -127,8 +126,6 @@ export function TableList({ () => Object.values(genericTables) .filter((table) => filter(showHiddenTables, table)) - // TODO: temp fix, remove this, use to hide geo tables for COG until 9.8 release - .filter((table) => !HIDDEN_GEO_TABLES.has(table.name)) .sort(sortFunction(({ name }) => name)), [filter, showHiddenTables] ); diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleRow.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleRow.tsx index 287815056d8..98f78b552e7 100644 --- a/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleRow.tsx +++ b/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleRow.tsx @@ -84,7 +84,7 @@ export function UniquenessRuleRow({ name === field) ?? diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleScope.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleScope.tsx index dbcc94d0c71..e37f7e78178 100644 --- a/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleScope.tsx +++ b/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleScope.tsx @@ -61,7 +61,7 @@ export function UniquenessRuleScope({ isDefault: false, isEnabled: true, isRelationship: true, - optionLabel: relationship.localization.name!, + optionLabel: relationship.localization.name ?? relationship.name, tableName: relationship.relatedTable.name, }, ]) diff --git a/specifyweb/frontend/js_src/lib/components/Toolbar/QueryTablesEdit.tsx b/specifyweb/frontend/js_src/lib/components/Toolbar/QueryTablesEdit.tsx index 613975104d3..5e07f49b1cc 100644 --- a/specifyweb/frontend/js_src/lib/components/Toolbar/QueryTablesEdit.tsx +++ b/specifyweb/frontend/js_src/lib/components/Toolbar/QueryTablesEdit.tsx @@ -37,16 +37,7 @@ export function QueryTablesEdit({ /> ); } -/* - * 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', -]); + export function TablesListEdit({ isNoRestrictionMode, defaultTables, @@ -67,8 +58,6 @@ export function TablesListEdit({ .filter((table) => tablesFilter(isNoRestrictionMode, false, true, table, selectedValues) ) - // TODO: temp fix, remove this, use to hide geo tables for COG until 9.8 release - .filter((table) => !HIDDEN_GEO_TABLES.has(table.name)) .map(({ name, label }) => ({ name, label })); const handleChanged = (items: RA): void => diff --git a/specifyweb/frontend/js_src/lib/components/WbPlanView/LineComponents.tsx b/specifyweb/frontend/js_src/lib/components/WbPlanView/LineComponents.tsx index 433a4761b77..d4c7648c1e0 100644 --- a/specifyweb/frontend/js_src/lib/components/WbPlanView/LineComponents.tsx +++ b/specifyweb/frontend/js_src/lib/components/WbPlanView/LineComponents.tsx @@ -227,8 +227,7 @@ export function MappingElement({ fieldsData, ...props }: MappingElementProps): JSX.Element { - const { collectionObjectType, ...rest } = fieldsData; - const fieldGroups = Object.entries(rest).reduce< + const fieldGroups = Object.entries(fieldsData).reduce< R> >((fieldGroups, [fieldName, fieldData]) => { const groupName = getFieldGroupName(