@plusscommunities/pluss-maintenance-web-forms 1.1.20-beta.0 → 1.1.21

package/dist/index.cjs.js

@@ -1143,7 +1143,7 @@ var JobList = /*#__PURE__*/function (_Component) {
       label: "".concat(values.textEntityName, " No."),
       key: 'jobId'
     }, {
-      label: 'Type',
+      label: values.textJobType,
       key: 'type'
     }, {
       label: 'Status',
@@ -1207,7 +1207,7 @@ var JobList = /*#__PURE__*/function (_Component) {
 
       if (this.state.filterOpen === 'type') {
         return /*#__PURE__*/React__default['default'].createElement(Components$6.Popup, {
-          title: "Select Type",
+          title: "Select ".concat(values.textJobType),
           maxWidth: 600,
           minWidth: 400,
           hasPadding: true,
@@ -1478,7 +1478,7 @@ var JobList = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           _this4.sortByCol('title');
         }
-      }, "Request title", this.renderSort('title')), /*#__PURE__*/React__default['default'].createElement("th", {
+      }, "Title", this.renderSort('title')), /*#__PURE__*/React__default['default'].createElement("th", {
         className: "".concat(this.sortIsActive('type')),
         style: {
           cursor: 'pointer',
@@ -1487,7 +1487,7 @@ var JobList = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           _this4.sortByCol('type');
         }
-      }, "Type", this.renderSort('type')), /*#__PURE__*/React__default['default'].createElement("th", {
+      }, values.textJobType, this.renderSort('type')), /*#__PURE__*/React__default['default'].createElement("th", {
         className: "".concat(this.sortIsActive('createdUnix')),
         style: {
           cursor: 'pointer',
@@ -1534,7 +1534,7 @@ var JobList = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           _this5.openFilter('type');
         },
-        text: "Type"
+        text: values.textJobType
       });
       var statusFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
         className: "marginRight-10",
@@ -3807,6 +3807,10 @@ var AddJob = /*#__PURE__*/function (_Component) {
         customFields: hasPrevCustomFields ? prevCustomFileds : selectedType.hasCustomFields ? selectedType.customFields : []
       };
 
+      if (!___default['default'].isEmpty(update.customFields) && !___default['default'].some(update.customFields, 'isTitle')) {
+        update.title = _this.state.selectedUser ? _this.state.selectedUser.displayName : '';
+      }
+
       _this.setState(update);
     });
 
@@ -3830,20 +3834,32 @@ var AddJob = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSelectUser", function (user) {
-      _this.setState({
+      var update = {
         selectedUser: user,
         userID: user.userId,
         userName: user.displayName,
         userFilterOpen: false
-      });
+      };
+
+      if (!___default['default'].isEmpty(_this.state.customFields) && !___default['default'].some(_this.state.customFields, 'isTitle')) {
+        update.title = user.displayName;
+      }
+
+      _this.setState(update);
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onUnselectUser", function () {
-      _this.setState({
+      var update = {
         selectedUser: null,
         userID: '',
         userName: ''
-      });
+      };
+
+      if (!___default['default'].isEmpty(_this.state.customFields) && !___default['default'].some(_this.state.customFields, 'isTitle')) {
+        update.title = '';
+      }
+
+      _this.setState(update);
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeAnswer", function (qId, answer) {
@@ -4625,7 +4641,7 @@ var AddJob = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
         type: "formLabel"
-      }, values.textJobType, " Type"), /*#__PURE__*/React__default['default'].createElement(reactBootstrap.DropdownButton, {
+      }, values.textJobType), /*#__PURE__*/React__default['default'].createElement(reactBootstrap.DropdownButton, {
         style: {
           minWidth: 80
         },
@@ -5083,7 +5099,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       hasCustomFields: true ,
       customFields: [___default['default'].cloneDeep(DEFAULT_FIELD)],
       jobTypeLevel: 1,
-      warnings: ['this is a test warning'],
+      warnings: [],
       showWarnings: false,
       submitting: false,
       success: false
@@ -5140,9 +5156,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
           warnings.push('There must be at least one required input');
         }
 
-        if (titleFieldCount === 0) {
-          warnings.push('One of the required inputs must be selected as title for the request');
-        } else if (titleFieldCount > 1) {
+        if (titleFieldCount > 1) {
           warnings.push('Only one required input can be selected as title for the request');
         }
       }
@@ -5251,7 +5265,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
 
       return /*#__PURE__*/React__default['default'].createElement(Components$1.CheckBox, {
         id: "fieldTitle".concat(fieldIndex),
-        label: "Use this field as the title for any ".concat(values.textSingularName, " of this type"),
+        label: "Use this field as the ".concat(values.textSingularName, " title"),
         isActive: field.isTitle,
         onChange: function onChange(e) {
           return _this4.onFieldIsTitleChanged(fieldIndex, e);
@@ -5638,7 +5652,13 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       if (success || !hasCustomFields) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "padding-60 paddingTop-8 paddingLeft-20"
-      }, /*#__PURE__*/React__default['default'].createElement("div", {
+      }, /*#__PURE__*/React__default['default'].createElement(Components$1.Text, {
+        type: "bodyLarge",
+        className: "marginBottom-24 paddingLeft-40",
+        style: {
+          color: PlussCore.Colours.COLOUR_LIGHTGREY
+        }
+      }, "By default, the form submission title will be the name of the person submitting the form. You can choose to select a different field to use as the title for the form submission."), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "fields"
       }, customFields.map(function (field, fieldIndex) {
         return _this15.renderField(field, fieldIndex);
@@ -5664,7 +5684,10 @@ var AddJobType = /*#__PURE__*/function (_Component) {
           warnings = _this$state6.warnings;
       if (!showWarnings || !warnings || warnings.length === 0) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
-        className: "padding-40 paddingBottom-8 text-help"
+        className: "padding-60 paddingVertical-8 text-bodyLarge",
+        style: {
+          color: PlussCore.Colours.COLOUR_RED
+        }
       }, "To save the form", /*#__PURE__*/React__default['default'].createElement("ul", {
         style: {
           padding: 0,
@@ -5682,8 +5705,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       var _this$state7 = this.state,
           success = _this$state7.success,
           jobTypeId = _this$state7.jobTypeId;
-      if (!success) return null; // TODO: Replace name with configuration
-
+      if (!success) return null;
       return /*#__PURE__*/React__default['default'].createElement(Components$1.SuccessPopup, {
         text: "".concat("".concat(values.textJobType), " has been ", !jobTypeId ? 'added' : 'edited'),
         buttons: [{
@@ -5724,7 +5746,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPage, null, /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPageContents, {
         noBottomButtons: success
       }, /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPageSection, {
-        className: "pageSectionWrapper--newPopup"
+        className: "pageSectionWrapper--newPopup pageSectionWrapper--newPopup950"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "addForm"
       }, this.renderBaseForm(), this.renderWarnings(), this.renderCustomForm()), this.renderSuccess())), /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPageBottomButtons, null, this.renderSubmit()));

package/dist/index.esm.js

@@ -1100,7 +1100,7 @@ var JobList = /*#__PURE__*/function (_Component) {
       label: "".concat(values.textEntityName, " No."),
       key: 'jobId'
     }, {
-      label: 'Type',
+      label: values.textJobType,
       key: 'type'
     }, {
       label: 'Status',
@@ -1164,7 +1164,7 @@ var JobList = /*#__PURE__*/function (_Component) {
 
       if (this.state.filterOpen === 'type') {
         return /*#__PURE__*/React.createElement(Components$6.Popup, {
-          title: "Select Type",
+          title: "Select ".concat(values.textJobType),
           maxWidth: 600,
           minWidth: 400,
           hasPadding: true,
@@ -1435,7 +1435,7 @@ var JobList = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           _this4.sortByCol('title');
         }
-      }, "Request title", this.renderSort('title')), /*#__PURE__*/React.createElement("th", {
+      }, "Title", this.renderSort('title')), /*#__PURE__*/React.createElement("th", {
         className: "".concat(this.sortIsActive('type')),
         style: {
           cursor: 'pointer',
@@ -1444,7 +1444,7 @@ var JobList = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           _this4.sortByCol('type');
         }
-      }, "Type", this.renderSort('type')), /*#__PURE__*/React.createElement("th", {
+      }, values.textJobType, this.renderSort('type')), /*#__PURE__*/React.createElement("th", {
         className: "".concat(this.sortIsActive('createdUnix')),
         style: {
           cursor: 'pointer',
@@ -1491,7 +1491,7 @@ var JobList = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           _this5.openFilter('type');
         },
-        text: "Type"
+        text: values.textJobType
       });
       var statusFilter = /*#__PURE__*/React.createElement(Components$6.Tag, {
         className: "marginRight-10",
@@ -3764,6 +3764,10 @@ var AddJob = /*#__PURE__*/function (_Component) {
         customFields: hasPrevCustomFields ? prevCustomFileds : selectedType.hasCustomFields ? selectedType.customFields : []
       };
 
+      if (!_.isEmpty(update.customFields) && !_.some(update.customFields, 'isTitle')) {
+        update.title = _this.state.selectedUser ? _this.state.selectedUser.displayName : '';
+      }
+
       _this.setState(update);
     });
 
@@ -3787,20 +3791,32 @@ var AddJob = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "onSelectUser", function (user) {
-      _this.setState({
+      var update = {
         selectedUser: user,
         userID: user.userId,
         userName: user.displayName,
         userFilterOpen: false
-      });
+      };
+
+      if (!_.isEmpty(_this.state.customFields) && !_.some(_this.state.customFields, 'isTitle')) {
+        update.title = user.displayName;
+      }
+
+      _this.setState(update);
     });
 
     _defineProperty(_assertThisInitialized(_this), "onUnselectUser", function () {
-      _this.setState({
+      var update = {
         selectedUser: null,
         userID: '',
         userName: ''
-      });
+      };
+
+      if (!_.isEmpty(_this.state.customFields) && !_.some(_this.state.customFields, 'isTitle')) {
+        update.title = '';
+      }
+
+      _this.setState(update);
     });
 
     _defineProperty(_assertThisInitialized(_this), "onChangeAnswer", function (qId, answer) {
@@ -4582,7 +4598,7 @@ var AddJob = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/React.createElement(Components$2.Text, {
         type: "formLabel"
-      }, values.textJobType, " Type"), /*#__PURE__*/React.createElement(DropdownButton, {
+      }, values.textJobType), /*#__PURE__*/React.createElement(DropdownButton, {
         style: {
           minWidth: 80
         },
@@ -5040,7 +5056,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       hasCustomFields: true ,
       customFields: [_.cloneDeep(DEFAULT_FIELD)],
       jobTypeLevel: 1,
-      warnings: ['this is a test warning'],
+      warnings: [],
       showWarnings: false,
       submitting: false,
       success: false
@@ -5097,9 +5113,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
           warnings.push('There must be at least one required input');
         }
 
-        if (titleFieldCount === 0) {
-          warnings.push('One of the required inputs must be selected as title for the request');
-        } else if (titleFieldCount > 1) {
+        if (titleFieldCount > 1) {
           warnings.push('Only one required input can be selected as title for the request');
         }
       }
@@ -5208,7 +5222,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
 
       return /*#__PURE__*/React.createElement(Components$1.CheckBox, {
         id: "fieldTitle".concat(fieldIndex),
-        label: "Use this field as the title for any ".concat(values.textSingularName, " of this type"),
+        label: "Use this field as the ".concat(values.textSingularName, " title"),
         isActive: field.isTitle,
         onChange: function onChange(e) {
           return _this4.onFieldIsTitleChanged(fieldIndex, e);
@@ -5595,7 +5609,13 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       if (success || !hasCustomFields) return null;
       return /*#__PURE__*/React.createElement("div", {
         className: "padding-60 paddingTop-8 paddingLeft-20"
-      }, /*#__PURE__*/React.createElement("div", {
+      }, /*#__PURE__*/React.createElement(Components$1.Text, {
+        type: "bodyLarge",
+        className: "marginBottom-24 paddingLeft-40",
+        style: {
+          color: Colours$2.COLOUR_LIGHTGREY
+        }
+      }, "By default, the form submission title will be the name of the person submitting the form. You can choose to select a different field to use as the title for the form submission."), /*#__PURE__*/React.createElement("div", {
         className: "fields"
       }, customFields.map(function (field, fieldIndex) {
         return _this15.renderField(field, fieldIndex);
@@ -5621,7 +5641,10 @@ var AddJobType = /*#__PURE__*/function (_Component) {
           warnings = _this$state6.warnings;
       if (!showWarnings || !warnings || warnings.length === 0) return null;
       return /*#__PURE__*/React.createElement("div", {
-        className: "padding-40 paddingBottom-8 text-help"
+        className: "padding-60 paddingVertical-8 text-bodyLarge",
+        style: {
+          color: Colours$2.COLOUR_RED
+        }
       }, "To save the form", /*#__PURE__*/React.createElement("ul", {
         style: {
           padding: 0,
@@ -5639,8 +5662,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       var _this$state7 = this.state,
           success = _this$state7.success,
           jobTypeId = _this$state7.jobTypeId;
-      if (!success) return null; // TODO: Replace name with configuration
-
+      if (!success) return null;
       return /*#__PURE__*/React.createElement(Components$1.SuccessPopup, {
         text: "".concat("".concat(values.textJobType), " has been ", !jobTypeId ? 'added' : 'edited'),
         buttons: [{
@@ -5681,7 +5703,7 @@ var AddJobType = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/React.createElement(Components$1.OverlayPage, null, /*#__PURE__*/React.createElement(Components$1.OverlayPageContents, {
         noBottomButtons: success
       }, /*#__PURE__*/React.createElement(Components$1.OverlayPageSection, {
-        className: "pageSectionWrapper--newPopup"
+        className: "pageSectionWrapper--newPopup pageSectionWrapper--newPopup950"
       }, /*#__PURE__*/React.createElement("div", {
         className: "addForm"
       }, this.renderBaseForm(), this.renderWarnings(), this.renderCustomForm()), this.renderSuccess())), /*#__PURE__*/React.createElement(Components$1.OverlayPageBottomButtons, null, this.renderSubmit()));

package/dist/index.umd.js

@@ -1122,7 +1122,7 @@
         label: "".concat(values.textEntityName, " No."),
         key: 'jobId'
       }, {
-        label: 'Type',
+        label: values.textJobType,
         key: 'type'
       }, {
         label: 'Status',
@@ -1186,7 +1186,7 @@
 
         if (this.state.filterOpen === 'type') {
           return /*#__PURE__*/React__default['default'].createElement(Components$6.Popup, {
-            title: "Select Type",
+            title: "Select ".concat(values.textJobType),
             maxWidth: 600,
             minWidth: 400,
             hasPadding: true,
@@ -1457,7 +1457,7 @@
           onClick: function onClick() {
             _this4.sortByCol('title');
           }
-        }, "Request title", this.renderSort('title')), /*#__PURE__*/React__default['default'].createElement("th", {
+        }, "Title", this.renderSort('title')), /*#__PURE__*/React__default['default'].createElement("th", {
           className: "".concat(this.sortIsActive('type')),
           style: {
             cursor: 'pointer',
@@ -1466,7 +1466,7 @@
           onClick: function onClick() {
             _this4.sortByCol('type');
           }
-        }, "Type", this.renderSort('type')), /*#__PURE__*/React__default['default'].createElement("th", {
+        }, values.textJobType, this.renderSort('type')), /*#__PURE__*/React__default['default'].createElement("th", {
           className: "".concat(this.sortIsActive('createdUnix')),
           style: {
             cursor: 'pointer',
@@ -1513,7 +1513,7 @@
           onClick: function onClick() {
             _this5.openFilter('type');
           },
-          text: "Type"
+          text: values.textJobType
         });
         var statusFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
           className: "marginRight-10",
@@ -3786,6 +3786,10 @@
           customFields: hasPrevCustomFields ? prevCustomFileds : selectedType.hasCustomFields ? selectedType.customFields : []
         };
 
+        if (!___default['default'].isEmpty(update.customFields) && !___default['default'].some(update.customFields, 'isTitle')) {
+          update.title = _this.state.selectedUser ? _this.state.selectedUser.displayName : '';
+        }
+
         _this.setState(update);
       });
 
@@ -3809,20 +3813,32 @@
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSelectUser", function (user) {
-        _this.setState({
+        var update = {
           selectedUser: user,
           userID: user.userId,
           userName: user.displayName,
           userFilterOpen: false
-        });
+        };
+
+        if (!___default['default'].isEmpty(_this.state.customFields) && !___default['default'].some(_this.state.customFields, 'isTitle')) {
+          update.title = user.displayName;
+        }
+
+        _this.setState(update);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onUnselectUser", function () {
-        _this.setState({
+        var update = {
           selectedUser: null,
           userID: '',
           userName: ''
-        });
+        };
+
+        if (!___default['default'].isEmpty(_this.state.customFields) && !___default['default'].some(_this.state.customFields, 'isTitle')) {
+          update.title = '';
+        }
+
+        _this.setState(update);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeAnswer", function (qId, answer) {
@@ -4604,7 +4620,7 @@
           }
         }, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
           type: "formLabel"
-        }, values.textJobType, " Type"), /*#__PURE__*/React__default['default'].createElement(reactBootstrap.DropdownButton, {
+        }, values.textJobType), /*#__PURE__*/React__default['default'].createElement(reactBootstrap.DropdownButton, {
           style: {
             minWidth: 80
           },
@@ -5062,7 +5078,7 @@
         hasCustomFields: true ,
         customFields: [___default['default'].cloneDeep(DEFAULT_FIELD)],
         jobTypeLevel: 1,
-        warnings: ['this is a test warning'],
+        warnings: [],
         showWarnings: false,
         submitting: false,
         success: false
@@ -5119,9 +5135,7 @@
             warnings.push('There must be at least one required input');
           }
 
-          if (titleFieldCount === 0) {
-            warnings.push('One of the required inputs must be selected as title for the request');
-          } else if (titleFieldCount > 1) {
+          if (titleFieldCount > 1) {
             warnings.push('Only one required input can be selected as title for the request');
           }
         }
@@ -5230,7 +5244,7 @@
 
         return /*#__PURE__*/React__default['default'].createElement(Components$1.CheckBox, {
           id: "fieldTitle".concat(fieldIndex),
-          label: "Use this field as the title for any ".concat(values.textSingularName, " of this type"),
+          label: "Use this field as the ".concat(values.textSingularName, " title"),
           isActive: field.isTitle,
           onChange: function onChange(e) {
             return _this4.onFieldIsTitleChanged(fieldIndex, e);
@@ -5617,7 +5631,13 @@
         if (success || !hasCustomFields) return null;
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "padding-60 paddingTop-8 paddingLeft-20"
-        }, /*#__PURE__*/React__default['default'].createElement("div", {
+        }, /*#__PURE__*/React__default['default'].createElement(Components$1.Text, {
+          type: "bodyLarge",
+          className: "marginBottom-24 paddingLeft-40",
+          style: {
+            color: PlussCore.Colours.COLOUR_LIGHTGREY
+          }
+        }, "By default, the form submission title will be the name of the person submitting the form. You can choose to select a different field to use as the title for the form submission."), /*#__PURE__*/React__default['default'].createElement("div", {
           className: "fields"
         }, customFields.map(function (field, fieldIndex) {
           return _this15.renderField(field, fieldIndex);
@@ -5643,7 +5663,10 @@
             warnings = _this$state6.warnings;
         if (!showWarnings || !warnings || warnings.length === 0) return null;
         return /*#__PURE__*/React__default['default'].createElement("div", {
-          className: "padding-40 paddingBottom-8 text-help"
+          className: "padding-60 paddingVertical-8 text-bodyLarge",
+          style: {
+            color: PlussCore.Colours.COLOUR_RED
+          }
         }, "To save the form", /*#__PURE__*/React__default['default'].createElement("ul", {
           style: {
             padding: 0,
@@ -5661,8 +5684,7 @@
         var _this$state7 = this.state,
             success = _this$state7.success,
             jobTypeId = _this$state7.jobTypeId;
-        if (!success) return null; // TODO: Replace name with configuration
-
+        if (!success) return null;
         return /*#__PURE__*/React__default['default'].createElement(Components$1.SuccessPopup, {
           text: "".concat("".concat(values.textJobType), " has been ", !jobTypeId ? 'added' : 'edited'),
           buttons: [{
@@ -5703,7 +5725,7 @@
         return /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPage, null, /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPageContents, {
           noBottomButtons: success
         }, /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPageSection, {
-          className: "pageSectionWrapper--newPopup"
+          className: "pageSectionWrapper--newPopup pageSectionWrapper--newPopup950"
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "addForm"
         }, this.renderBaseForm(), this.renderWarnings(), this.renderCustomForm()), this.renderSuccess())), /*#__PURE__*/React__default['default'].createElement(Components$1.OverlayPageBottomButtons, null, this.renderSubmit()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-web-forms",
-  "version": "1.1.20-beta.0",
+  "version": "1.1.21",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/index.cjs.js",
   "scripts": {

package/src/components/JobList.js

@@ -30,7 +30,7 @@ class JobList extends Component {
       { label: 'Select All', key: '' },
       { label: 'System Id', key: 'id' },
       { label: `${values.textEntityName} No.`, key: 'jobId' },
-      { label: 'Type', key: 'type' },
+      { label: values.textJobType, key: 'type' },
       { label: 'Status', key: 'status' },
       { label: 'Title', key: 'title' },
       { label: 'Address', key: 'room' },
@@ -381,7 +381,7 @@ class JobList extends Component {
     }
     if (this.state.filterOpen === 'type') {
       return (
-        <Components.Popup title="Select Type" maxWidth={600} minWidth={400} hasPadding onClose={this.closeFilter}>
+        <Components.Popup title={`Select ${values.textJobType}`} maxWidth={600} minWidth={400} hasPadding onClose={this.closeFilter}>
           {_.sortBy(_.uniq(this.props.source.map((r) => r.type)), (t) => t.toLowerCase()).map((type) => {
             return (
               <Components.Tag
@@ -624,7 +624,7 @@ class JobList extends Component {
                 this.sortByCol('title');
               }}
             >
-              Request title{this.renderSort('title')}
+              Title{this.renderSort('title')}
             </th>
             <th
               className={`${this.sortIsActive('type')}`}
@@ -633,7 +633,8 @@ class JobList extends Component {
                 this.sortByCol('type');
               }}
             >
-              Type{this.renderSort('type')}
+              {values.textJobType}
+              {this.renderSort('type')}
             </th>
             <th
               className={`${this.sortIsActive('createdUnix')}`}
@@ -679,7 +680,7 @@ class JobList extends Component {
         onClick={() => {
           this.openFilter('type');
         }}
-        text="Type"
+        text={values.textJobType}
       />
     );
     let statusFilter = (

package/src/screens/AddJob.js

@@ -157,6 +157,10 @@ class AddJob extends Component {
       customFields: hasPrevCustomFields ? prevCustomFileds : selectedType.hasCustomFields ? selectedType.customFields : [],
     };
 
+    if (!_.isEmpty(update.customFields) && !_.some(update.customFields, 'isTitle')) {
+      update.title = this.state.selectedUser ? this.state.selectedUser.displayName : '';
+    }
+
     this.setState(update);
   };
 
@@ -189,11 +193,19 @@ class AddJob extends Component {
   };
 
   onSelectUser = (user) => {
-    this.setState({ selectedUser: user, userID: user.userId, userName: user.displayName, userFilterOpen: false });
+    const update = { selectedUser: user, userID: user.userId, userName: user.displayName, userFilterOpen: false };
+    if (!_.isEmpty(this.state.customFields) && !_.some(this.state.customFields, 'isTitle')) {
+      update.title = user.displayName;
+    }
+    this.setState(update);
   };
 
   onUnselectUser = () => {
-    this.setState({ selectedUser: null, userID: '', userName: '' });
+    const update = { selectedUser: null, userID: '', userName: '' };
+    if (!_.isEmpty(this.state.customFields) && !_.some(this.state.customFields, 'isTitle')) {
+      update.title = '';
+    }
+    this.setState(update);
   };
 
   onChangeAnswer = (qId, answer) => {
@@ -763,7 +775,7 @@ class AddJob extends Component {
             }}
           />
           <div style={{ marginBottom: 15 }}>
-            <Components.Text type="formLabel">{values.textJobType} Type</Components.Text>
+            <Components.Text type="formLabel">{values.textJobType}</Components.Text>
             <DropdownButton style={{ minWidth: 80 }} bsStyle="default" title={this.state.type} id="typeSelect" onSelect={this.onSelectType}>
               {this.renderTypeOptions()}
             </DropdownButton>

package/src/screens/AddJobType.js

@@ -8,6 +8,7 @@ import { PlussCore } from '../feature.config';
 import { jobTypesUpdate } from '../actions';
 import { maintenanceActions } from '../apis';
 import { values } from '../values.config';
+import { Colours } from '@plusscommunities/pluss-core-web';
 
 const { Components, Session, Helper } = PlussCore;
 const DEFAULT_FIELD = { type: 'text', label: '', mandatory: false, isTitle: false, values: [''] };
@@ -72,7 +73,7 @@ class AddJobType extends Component {
       hasCustomFields: values.forceCustomFields ? true : false,
       customFields: [_.cloneDeep(DEFAULT_FIELD)],
       jobTypeLevel: 1,
-      warnings: ['this is a test warning'],
+      warnings: [],
       showWarnings: false,
       submitting: false,
       success: false,
@@ -153,9 +154,7 @@ class AddJobType extends Component {
       if (!hasMandatoryField) {
         warnings.push('There must be at least one required input');
       }
-      if (titleFieldCount === 0) {
-        warnings.push('One of the required inputs must be selected as title for the request');
-      } else if (titleFieldCount > 1) {
+      if (titleFieldCount > 1) {
         warnings.push('Only one required input can be selected as title for the request');
       }
     }
@@ -406,7 +405,7 @@ class AddJobType extends Component {
     return (
       <Components.CheckBox
         id={`fieldTitle${fieldIndex}`}
-        label={`Use this field as the title for any ${values.textSingularName} of this type`}
+        label={`Use this field as the ${values.textSingularName} title`}
         isActive={field.isTitle}
         onChange={(e) => this.onFieldIsTitleChanged(fieldIndex, e)}
       />
@@ -748,6 +747,10 @@ class AddJobType extends Component {
 
     return (
       <div className="padding-60 paddingTop-8 paddingLeft-20">
+        <Components.Text type="bodyLarge" className="marginBottom-24 paddingLeft-40" style={{ color: Colours.COLOUR_LIGHTGREY }}>
+          By default, the form submission title will be the name of the person submitting the form. You can choose to select a different
+          field to use as the title for the form submission.
+        </Components.Text>
         <div className="fields">
           {customFields.map((field, fieldIndex) => this.renderField(field, fieldIndex))}
           <div className="clearfix addoption addField" onClick={() => this.onAddNewField()}>
@@ -766,7 +769,7 @@ class AddJobType extends Component {
     if (!showWarnings || !warnings || warnings.length === 0) return null;
 
     return (
-      <div className="padding-40 paddingBottom-8 text-help">
+      <div className="padding-60 paddingVertical-8 text-bodyLarge" style={{ color: Colours.COLOUR_RED }}>
         To save the form
         <ul style={{ padding: 0, paddingLeft: 16 }}>
           {warnings.map((warn, index) => (
@@ -781,7 +784,6 @@ class AddJobType extends Component {
     const { success, jobTypeId } = this.state;
     if (!success) return null;
 
-    // TODO: Replace name with configuration
     return (
       <Components.SuccessPopup
         text={`${`${values.textJobType}`} has been ${!jobTypeId ? 'added' : 'edited'}`}
@@ -818,7 +820,7 @@ class AddJobType extends Component {
     return (
       <Components.OverlayPage>
         <Components.OverlayPageContents noBottomButtons={success}>
-          <Components.OverlayPageSection className="pageSectionWrapper--newPopup">
+          <Components.OverlayPageSection className="pageSectionWrapper--newPopup pageSectionWrapper--newPopup950">
             <div className="addForm">
               {this.renderBaseForm()}
               {this.renderWarnings()}