Merge pull request #175 from performant-software/feature/udf23_field_order

UDF #23 - Field order

Author: dleadbetter

packages/controlled-vocabulary/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/controlled-vocabulary",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A package of components to allow user to configure dropdown elements. Use with the \"controlled_vocabulary\" gem.",
   "license": "MIT",
   "main": "./build/index.js",
@@ -12,8 +12,8 @@
     "build": "webpack --mode production && flow-copy-source -v src types"
   },
   "dependencies": {
-    "@performant-software/semantic-components": "^1.0.2",
-    "@performant-software/shared-components": "^1.0.2",
+    "@performant-software/semantic-components": "^1.0.3",
+    "@performant-software/shared-components": "^1.0.3",
     "i18next": "^21.9.2",
     "semantic-ui-react": "^2.1.2",
     "underscore": "^1.13.2"

packages/semantic-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/semantic-components",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A package of shared components based on the Semantic UI Framework.",
   "license": "MIT",
   "main": "./build/index.js",
@@ -12,7 +12,7 @@
     "build": "webpack --mode production && flow-copy-source -v src types"
   },
   "dependencies": {
-    "@performant-software/shared-components": "^1.0.2",
+    "@performant-software/shared-components": "^1.0.3",
     "@react-google-maps/api": "^2.8.1",
     "axios": "^0.26.1",
     "citeproc": "^2.4.62",
@@ -44,4 +44,4 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }
-}
+}

packages/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/shared-components",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A package of shared, framework agnostic, components.",
   "license": "MIT",
   "main": "./build/index.js",

packages/storybook/.storybook/routes/UserDefinedFields.js

@@ -35,29 +35,35 @@ const addRoutes = (router) => {
       table_name: 'People',
       column_name: 'First name',
       data_type: 'String',
-      required: true
+      required: true,
+      order: 10
     }, {
       table_name: 'People',
       column_name: 'Last name',
       data_type: 'String',
-      required: true
+      required: true,
+      order: 20
     }, {
       table_name: 'People',
       column_name: 'Date of birth',
-      data_type: 'Date'
+      data_type: 'Date',
+      order: 30
     }, {
       table_name: 'People',
       column_name: 'Biography',
-      data_type: 'RichText'
+      data_type: 'RichText',
+      order: 40
     }, {
       table_name: 'People',
       column_name: 'Favorite color',
       data_type: 'Select',
+      order: 50,
       options: ['Red', 'Blue', 'Green', 'Orange', 'Yellow']
     }, {
       table_name: 'People',
       column_name: 'Year of service',
-      data_type: 'Number'
+      data_type: 'Number',
+      order: 60
     }];
 
     response.send({

packages/user-defined-fields/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/user-defined-fields",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A package of components used for allowing end users to define fields on models. Use with the \"user_defined_fields\" gem.",
   "license": "MIT",
   "main": "./build/index.js",
@@ -9,8 +9,8 @@
     "build": "webpack --mode production && flow-copy-source -v src types"
   },
   "dependencies": {
-    "@performant-software/semantic-components": "^1.0.2",
-    "@performant-software/shared-components": "^1.0.2",
+    "@performant-software/semantic-components": "^1.0.3",
+    "@performant-software/shared-components": "^1.0.3",
     "i18next": "^21.9.1",
     "semantic-ui-react": "^2.1.2",
     "underscore": "^1.13.2"

packages/user-defined-fields/src/components/UserDefinedFieldModal.js

@@ -83,6 +83,14 @@ const UserDefinedFieldModal: ComponentType<any> = (props) => {
           selectOnBlur={false}
           value={props.item.data_type || ''}
         />
+        <Form.Input
+          error={props.isError('order')}
+          label={i18n.t('UserDefinedFieldModal.labels.order')}
+          onChange={props.onTextInputChange.bind(this, 'order')}
+          required={props.isRequired('oder')}
+          value={props.item.order || 0}
+          type='number'
+        />
         <Form.Group>
           <Form.Checkbox
             error={props.isError('required')}

packages/user-defined-fields/src/components/UserDefinedFieldsEmbeddedList.js

@@ -31,6 +31,9 @@ const UserDefinedFieldsEmbeddedList = (props: Props) => (
       name: 'required',
       label: i18n.t('UserDefinedFieldsEmbeddedList.columns.required'),
       render: (udf) => <BooleanIcon value={udf.required} />
+    }, {
+      name: 'order',
+      label: i18n.t('UserDefinedFieldsEmbeddedList.columns.order')
     }]}
     items={props.items}
     modal={{

packages/user-defined-fields/src/components/UserDefinedFieldsForm.js

@@ -178,6 +178,8 @@ const UserDefinedFieldsForm: ComponentType<any> = (props: Props) => {
     const params = {
       defineable_id: props.defineableId,
       defineable_type: props.defineableType,
+      per_page: 0,
+      sort_by: 'order',
       table_name: props.tableName
     };
 

packages/user-defined-fields/src/components/UserDefinedFieldsList.js

@@ -26,6 +26,9 @@ const UserDefinedFieldsList: ComponentType<any> = () => (
       name: 'required',
       label: i18n.t('UserDefinedFieldsList.columns.required'),
       render: (udf) => <BooleanIcon value={udf.required} />
+    }, {
+      name: 'order',
+      label: i18n.t('UserDefinedFieldsList.columns.order')
     }]}
     collectionName='user_defined_fields'
     modal={{

packages/user-defined-fields/src/i18n/en.json

@@ -4,6 +4,7 @@
       "allowMultiple": "Allow multiple",
       "dataType": "Data type",
       "name": "Name",
+      "order": "Order",
       "required": "Required",
       "searchable": "Searchable",
       "table": "Table"
@@ -17,6 +18,7 @@
     "columns": {
       "dataType": "Data type",
       "name": "Name",
+      "order": "Order",
       "required": "Required",
       "table": "Table"
     }
@@ -25,6 +27,7 @@
     "columns": {
       "dataType": "Data type",
       "name": "Name",
+      "order": "Order",
       "required": "Required",
       "table": "Table"
     }