BASIRA #254 - Removing "sewing_supports_visible" column from document…

…s; Defaulting "number_sewing_supports" to "0"

app/models/document.rb

@@ -17,7 +17,7 @@ class Document < ApplicationRecord
   after_create :set_actor_type
 
   # Resourceable parameters
-  allow_params :visual_context_id, :name, :notes, :sewing_supports_visible, :number_sewing_supports, :number_fastenings,
+  allow_params :visual_context_id, :name, :notes, :number_sewing_supports, :number_fastenings,
                :inscriptions_on_binding, :inscription_text, :endband_present, :uncut_fore_edges, :fore_edge_text,
                :bookmarks_registers, :text_columns, :ruling, :rubrication, :identity, :transcription, :transcription_expanded,
                :transcription_translation, :artwork_id, actions_attributes: [:id, :notes, :_destroy,

app/models/search/document.rb

@@ -53,7 +53,6 @@ def published
       search_attribute :aperture, object: 'Document', group: 'Aperture', facet: true
       search_attribute :binding_type, object: 'Document', group: 'Binding Type', multiple: true, facet: true
       search_attribute :binding_color, object: 'Document', group: 'Color', form_field: 'binding_color', multiple: true, facet: true
-      search_attribute :sewing_supports_visible, facet: true
       search_attribute :number_sewing_supports, facet: true
       search_attribute :spine_features, object: 'Document', group: 'Spine Features', multiple: true, facet: true
       search_attribute :furniture, object: 'Document', group: 'Furniture', multiple: true, facet: true

app/serializers/documents_serializer.rb

@@ -5,10 +5,10 @@ class DocumentsSerializer < BaseSerializer
 
   index_attributes :id, :name
 
-  show_attributes :id, :name, :visual_context_id, :notes, :sewing_supports_visible, :number_sewing_supports,
-                  :number_fastenings, :inscriptions_on_binding, :inscription_text, :endband_present,
-                  :uncut_fore_edges, :fore_edge_text, :bookmarks_registers, :text_columns, :ruling, :rubrication,
-                  :transcription, :transcription_expanded, :transcription_translation, :identity,
+  show_attributes :id, :name, :visual_context_id, :notes, :number_sewing_supports, :number_fastenings,
+                  :inscriptions_on_binding, :inscription_text, :endband_present, :uncut_fore_edges, :fore_edge_text,
+                  :bookmarks_registers, :text_columns, :ruling, :rubrication, :transcription, :transcription_expanded,
+                  :transcription_translation, :identity,
                   qualifications: QualificationsSerializer, actions: [:id, :document_id, :notes,
                   qualifications: QualificationsSerializer]
 

client/package.json

@@ -6,8 +6,8 @@
   "dependencies": {
     "@babel/eslint-parser": "^7.21.3",
     "@babel/runtime": "^7.22.3",
-    "@performant-software/semantic-components": "^2.2.17-beta.0",
-    "@performant-software/shared-components": "^2.2.17-beta.0",
+    "@performant-software/semantic-components": "^2.2.17-beta.2",
+    "@performant-software/shared-components": "^2.2.17-beta.2",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",

client/src/components/SearchFacets.js

@@ -299,13 +299,6 @@ const SearchFacets = (props: any) => {
         toggleable
         useRefinementList={useRefinementList}
       />
-      <FacetToggle
-        attribute='sewing_supports_visible_facet'
-        defaultActive={false}
-        ref={setRef}
-        title={getLabel('sewing_supports_visible_facet')}
-        useToggleRefinement={useToggleRefinement}
-      />
       <FacetSlider
         attribute='number_sewing_supports_facet'
         defaultActive={false}

client/src/pages/Document.js

@@ -122,10 +122,6 @@ const Document = () => {
               object: 'Document',
               group: 'Binding Color'
             }
-          }, {
-            name: 'sewing_supports_visible',
-            label: t('Document.labels.sewingSupportsVisible'),
-            renderValue: () => <BooleanIcon value={item.sewing_supports_visible} />
           }, {
             name: 'number_sewing_supports',
             label: t('Document.labels.numberSewingSupports')

client/src/pages/admin/Document.js

@@ -188,24 +188,18 @@ const Document = (props: Props) => {
                 multiple
                 object='Document'
               />
-              <Form.Checkbox
-                checked={props.item.sewing_supports_visible}
-                error={props.isError('sewing_supports_visible')}
-                label={props.t('Document.labels.sewingSupportsVisible')}
-                onChange={props.onCheckboxInputChange.bind(this, 'sewing_supports_visible')}
-                required={props.isRequired('sewing_supports_visible')}
-                toggle
-              />
               <Form.Input
                 error={props.isError('number_sewing_supports')}
                 label={props.t('Document.labels.numberSewingSupports')}
                 required={props.isRequired('number_sewing_supports')}
               >
                 <Dropdown
+                  defaultValue={0}
+                  fluid
                   onChange={props.onTextInputChange.bind(this, 'number_sewing_supports')}
                   options={zeroToTenRangeOptionsList}
                   selection
-                  value={props.item.number_sewing_supports || ''}
+                  value={props.item.number_sewing_supports}
                 />
               </Form.Input>
               <ValueListDropdown
@@ -409,6 +403,7 @@ const Document = (props: Props) => {
               >
                 <Dropdown
                   defaultValue={0}
+                  fluid
                   onChange={props.onTextInputChange.bind(this, 'text_columns')}
                   options={zeroToTenRangeOptionsList}
                   selection

client/src/transforms/Document.js

@@ -31,7 +31,6 @@ class Document extends FormDataTransform {
       'visual_context_id',
       'name',
       'notes',
-      'sewing_supports_visible',
       'number_sewing_supports',
       'number_fastenings',
       'inscriptions_on_binding',

client/src/types/Document.js

@@ -6,7 +6,6 @@ export type Document = {
   artwork_id: number,
   name: string,
   notes: string,
-  sewing_supports_visible: boolean,
   number_sewing_supports: number,
   number_fastenings: number,
   location_of_fastenings: string,

client/yarn.lock

@@ -2549,10 +2549,10 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@performant-software/semantic-components@^2.2.17-beta.0":
-  version "2.2.17-beta.0"
-  resolved "https://registry.yarnpkg.com/@performant-software/semantic-components/-/semantic-components-2.2.17-beta.0.tgz#1a7102924f1da157ea1e4403366c53386e5cc3db"
-  integrity sha512-S76jbv7CZL6Kcvltr610yd0xV2Mq/Xaudylt6En19RJpqa0Cz0Sm04ETqx2a2kVlCt5xGHtKgRnhPOinaIsshA==
+"@performant-software/semantic-components@^2.2.17-beta.2":
+  version "2.2.17-beta.2"
+  resolved "https://registry.yarnpkg.com/@performant-software/semantic-components/-/semantic-components-2.2.17-beta.2.tgz#d1d11a19bce3c88ccca50ac6507358f458360000"
+  integrity sha512-tIrfMKisI1b0XMgpjUeYbBrF+0/I4d5oxuUGuH7qcwyXiXPH7s3S7f5vx/FRf0SoqAaxcJHVU8RBF7P6fpoORQ==
   dependencies:
     "@react-google-maps/api" "^2.8.1"
     axios "^0.26.1"
@@ -2570,10 +2570,10 @@
     zotero-api-client "^0.40.0"
     zotero-translation-client "^5.0.1"
 
-"@performant-software/shared-components@^2.2.17-beta.0":
-  version "2.2.17-beta.0"
-  resolved "https://registry.yarnpkg.com/@performant-software/shared-components/-/shared-components-2.2.17-beta.0.tgz#ce0637ca07a5c828dcc29751816e0081abe884ad"
-  integrity sha512-Q/+/ALS9TWcOuycBDRpt4sta8+tyDWzAzhBi5IEZq+r/urooK1VybrEEP6hcUi+ta1qOcDT0UewscJb0pAf03g==
+"@performant-software/shared-components@^2.2.17-beta.2":
+  version "2.2.17-beta.2"
+  resolved "https://registry.yarnpkg.com/@performant-software/shared-components/-/shared-components-2.2.17-beta.2.tgz#e82d33b169f9fc09d8359f18a707b3f3c9afa7bb"
+  integrity sha512-dFAk0ABAXdjm+OWm7qGRkWo/e4kdo6Idv4u09KLfas3m4kKZZ/o4XzAffgA9g1fM9/CRz7Wuk5iJWzO+viRQPw==
   dependencies:
     "@react-google-maps/api" "^2.8.1"
     axios "^0.26.1"

db/data/20241127010852_reset_document_text_columns.rb → db/data/20241127010852_reset_documents_text_columns.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ResetDocumentTextColumns < ActiveRecord::Migration[7.0]
+class ResetDocumentsTextColumns < ActiveRecord::Migration[7.0]
   def up
     execute <<-SQL.squish
       UPDATE documents

db/data/20241127121425_reset_documents_number_sewing_supports.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class ResetDocumentsNumberSewingSupports < ActiveRecord::Migration[7.0]
+  def up
+    execute <<-SQL.squish
+      UPDATE documents
+         SET number_sewing_supports = 0
+       WHERE number_sewing_supports IS NULL;
+    SQL
+
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

db/data_schema.rb

@@ -1 +1 @@
-DataMigrate::Data.define(version: 20241127010852)
+DataMigrate::Data.define(version: 20241127121425)

db/migrate/20241127014830_remove_documents_sewing_supports_visible.rb

@@ -0,0 +1,5 @@
+class RemoveDocumentsSewingSupportsVisible < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :documents, :sewing_supports_visible
+  end
+end

db/migrate/20241127121542_change_documents_number_sewing_supports_default_value.rb

@@ -0,0 +1,5 @@
+class ChangeDocumentsNumberSewingSupportsDefaultValue < ActiveRecord::Migration[7.0]
+  def change
+    change_column :documents, :number_sewing_supports, :integer, null: false, default: 0
+  end
+end

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: 2024_11_27_011227) do
+ActiveRecord::Schema[7.0].define(version: 2024_11_27_121542) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "plpgsql"
@@ -112,8 +112,7 @@
     t.bigint "visual_context_id", null: false
     t.string "name"
     t.string "notes"
-    t.boolean "sewing_supports_visible", default: false
-    t.integer "number_sewing_supports"
+    t.integer "number_sewing_supports", default: 0, null: false
     t.integer "number_fastenings"
     t.boolean "inscriptions_on_binding", default: false, null: false
     t.text "inscription_text"