diff --git a/client/src/components/TaxonomyItemForm.js b/client/src/components/TaxonomyItemForm.js index a84beeb..bebe3be 100644 --- a/client/src/components/TaxonomyItemForm.js +++ b/client/src/components/TaxonomyItemForm.js @@ -1,6 +1,7 @@ // @flow import type { EditContainerProps } from '@performant-software/shared-components'; +import { UserDefinedFieldsForm } from '@performant-software/user-defined-fields'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { Form } from 'semantic-ui-react'; @@ -23,6 +24,17 @@ const TaxonomyItemForm = (props: Props) => { required={props.isRequired('name')} value={props.item.name} /> + { props.item.project_model_id && ( + props.onSetState({ user_defined: userDefined })} + onClearValidationError={props.onClearValidationError} + tableName='CoreDataConnector::Taxonomy' + /> + )} ); }; diff --git a/client/src/pages/ProjectModel.js b/client/src/pages/ProjectModel.js index c2428a9..ac7f473 100644 --- a/client/src/pages/ProjectModel.js +++ b/client/src/pages/ProjectModel.js @@ -160,34 +160,32 @@ const ProjectModelForm = (props: Props) => { required={props.isRequired('allow_identifiers')} /> - { props.item.model_class !== 'CoreDataConnector::Taxonomy' && ( - - - - )} + + + { return [ 'project_model_id', - 'name' + 'name', + 'user_defined' ]; } diff --git a/db/migrate/20250226180753_add_user_defined_fields_to_core_data_connector_taxonomies.core_data_connector.rb b/db/migrate/20250226180753_add_user_defined_fields_to_core_data_connector_taxonomies.core_data_connector.rb new file mode 100644 index 0000000..56bf07b --- /dev/null +++ b/db/migrate/20250226180753_add_user_defined_fields_to_core_data_connector_taxonomies.core_data_connector.rb @@ -0,0 +1,12 @@ +# This migration comes from core_data_connector (originally 20250226175155) +class AddUserDefinedFieldsToCoreDataConnectorTaxonomies < ActiveRecord::Migration[7.0] + def up + add_column :core_data_connector_taxonomies, :user_defined, :jsonb, default: {} + add_index :core_data_connector_taxonomies, :user_defined, using: :gin + end + + def down + remove_index :core_data_connector_taxonomies, :user_defined + remove_column :core_data_connector_taxonomies, :user_defined + end +end diff --git a/db/schema.rb b/db/schema.rb index 8b904e4..93340c2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2025_02_20_152730) do +ActiveRecord::Schema[7.0].define(version: 2025_02_26_180753) do # These are extensions that must be enabled in order to support this database enable_extension "pg_stat_statements" enable_extension "pgcrypto" @@ -273,7 +273,9 @@ t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false t.integer "z_taxonomy_id" t.uuid "import_id" + t.jsonb "user_defined", default: {} t.index ["project_model_id"], name: "index_core_data_connector_taxonomies_on_project_model_id" + t.index ["user_defined"], name: "index_core_data_connector_taxonomies_on_user_defined", using: :gin end create_table "core_data_connector_user_projects", force: :cascade do |t|