@plusscommunities/pluss-maintenance-web 1.1.38 → 1.1.40

package/dist/index.cjs.js

@@ -80,6 +80,7 @@ const values = {
   svgPathGridIconViewBox: '0 0 30 30',
   menuOrder: 10,
   optionOnlyForResidents: 'onlyForResidentsMaintenance',
+  optionDisableAddressAutoPopulate: 'disableAddressAutoPopulateMaintenance',
   textEmptyDescription: 'allows your users to submit Requests (such as maintenance requests) that all appear in this job board.',
   textEmptyExample: 'Example might be; Fix my light bulb, hand rail is broken, or please send flowers to Mum.',
   textEmptyJobTypes: 'Please add the many categories of request types that exist in your village which work alongside the Maintenance area.',
@@ -126,7 +127,7 @@ const FeatureConfig = {
   key: values.featureKey,
   aliases: values.aliases,
   singularName: values.textSingularName,
-  description: 'Submit maintenance requests and track the progress.',
+  description: "Submit maintenance requests and track the progress.",
   emptyText: values.textYourRequestHere,
   widgetOptions: [{
     key: values.featureKey,
@@ -134,10 +135,22 @@ const FeatureConfig = {
     main: true,
     hideOnTabNumbers: [],
     optionKey: values.optionOnlyForResidents,
-    type: 'toggle',
+    type: "toggle",
     inverseOption: false,
-    title: 'Limit Admins to Only Submit on Behalf of Primary Users',
-    description: 'This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.',
+    title: "Limit Admins to Only Submit on Behalf of Primary Users",
+    description: "This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.",
+    defaultNew: false,
+    default: false
+  }, {
+    key: values.featureKey,
+    widget: true,
+    main: true,
+    hideOnTabNumbers: [],
+    optionKey: values.optionDisableAddressAutoPopulate,
+    type: "toggle",
+    inverseOption: false,
+    title: "Do not auto-fill the user's address",
+    description: "When enabled, the address field will not be pre-filled from the user's profile when submitting a new ".concat(values.textSingularName, ". It must be entered manually each time."),
     defaultNew: false,
     default: false
   }],
@@ -150,20 +163,20 @@ const FeatureConfig = {
     url: values.routeRequestsHub,
     countProps: null,
     visibleExps: {
-      type: 'and',
+      type: "and",
       exps: [{
-        type: 'feature',
+        type: "feature",
         value: values.featureKey
       }, {
-        type: 'or',
+        type: "or",
         exps: [{
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceTracking
         }, {
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceTypes
         }, {
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceAssignment
         }]
       }]
@@ -228,21 +241,21 @@ const FeatureConfig = {
     exact: true
   }],
   env: {
-    baseStage: '',
-    baseAPIUrl: '',
-    baseUploadsUrl: '',
-    uploadBucket: '',
-    colourBrandingMain: '',
-    colourBrandingOff: '',
-    colourBrandingApp: '',
-    defaultProfileImage: '',
-    utcOffset: '',
+    baseStage: "",
+    baseAPIUrl: "",
+    baseUploadsUrl: "",
+    uploadBucket: "",
+    colourBrandingMain: "",
+    colourBrandingOff: "",
+    colourBrandingApp: "",
+    defaultProfileImage: "",
+    utcOffset: "",
     hasAvailableNews: false,
     newsHaveTags: true,
     defaultAllowComments: true,
-    makeApiKey: '',
-    logo: '',
-    clientName: ''
+    makeApiKey: "",
+    logo: "",
+    clientName: ""
   },
   init: environment => {
     FeatureConfig.env = environment;
@@ -594,7 +607,6 @@ const stringActions = Apis$2.stringActions;
 var jobStatusOptions = [
 	{
 		text: "Open",
-		alias: "Unassigned",
 		order: 0,
 		color: "#d5dde4",
 		category: "Not Actioned"
@@ -791,16 +803,15 @@ class JobList extends React.Component {
       } = this.props;
       const params = {};
 
-      // Status filter: translate "All Incomplete" into the actual incomplete statuses.
-      // Expand each status to include its `alias` so legacy DB values (e.g. "Unassigned"
-      // for "Open") still match the filter.
+      // Status filter: translate "All Incomplete" into the actual incomplete statuses
       if (selectedStatusFilter) {
-        const selectedStatusTypes = selectedStatusFilter === STATUS_IMCOMPLETE ? statusTypes.filter(s => s.category !== STATUS_COMPLETED) : statusTypes.filter(s => s.text === selectedStatusFilter);
-        const expanded = ___default["default"].uniq(selectedStatusTypes.flatMap(s => s.alias ? [s.text, s.alias] : [s.text]));
-        if (expanded.length > 0) {
-          params.status = expanded.join(',');
-        } else if (selectedStatusFilter !== STATUS_IMCOMPLETE) {
-          // Fallback if the status isn't in statusTypes (shouldn't happen normally)
+        if (selectedStatusFilter === STATUS_IMCOMPLETE) {
+          // Exclude completed statuses - pass all non-completed status texts
+          const incompleteStatuses = statusTypes.filter(s => s.category !== STATUS_COMPLETED).map(s => s.text);
+          if (incompleteStatuses.length > 0) {
+            params.status = incompleteStatuses.join(',');
+          }
+        } else {
           params.status = selectedStatusFilter;
         }
       }
@@ -4312,7 +4323,7 @@ class AddJob extends React.Component {
           if (response.data.user.phoneNumber) {
             contactUpdate.phone = response.data.user.phoneNumber;
           }
-          if (response.data.user.unit) {
+          if (!this.props.disableAddressAutoPopulate && response.data.user.unit) {
             contactUpdate.room = response.data.user.unit;
           }
           // Update contact fields when data arrives
@@ -5148,7 +5159,8 @@ const mapStateToProps$2 = state => {
   return {
     auth,
     strings: state.strings && state.strings.config || {},
-    optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents)
+    optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents),
+    disableAddressAutoPopulate: Helper$1.getSiteSettingFromState(state, values.optionDisableAddressAutoPopulate)
   };
 };
 var AddJob$1 = reactRedux.connect(mapStateToProps$2, {

package/dist/index.esm.js

@@ -49,6 +49,7 @@ const values = {
   svgPathGridIconViewBox: '0 0 30 30',
   menuOrder: 10,
   optionOnlyForResidents: 'onlyForResidentsMaintenance',
+  optionDisableAddressAutoPopulate: 'disableAddressAutoPopulateMaintenance',
   textEmptyDescription: 'allows your users to submit Requests (such as maintenance requests) that all appear in this job board.',
   textEmptyExample: 'Example might be; Fix my light bulb, hand rail is broken, or please send flowers to Mum.',
   textEmptyJobTypes: 'Please add the many categories of request types that exist in your village which work alongside the Maintenance area.',
@@ -95,7 +96,7 @@ const FeatureConfig = {
   key: values.featureKey,
   aliases: values.aliases,
   singularName: values.textSingularName,
-  description: 'Submit maintenance requests and track the progress.',
+  description: "Submit maintenance requests and track the progress.",
   emptyText: values.textYourRequestHere,
   widgetOptions: [{
     key: values.featureKey,
@@ -103,10 +104,22 @@ const FeatureConfig = {
     main: true,
     hideOnTabNumbers: [],
     optionKey: values.optionOnlyForResidents,
-    type: 'toggle',
+    type: "toggle",
     inverseOption: false,
-    title: 'Limit Admins to Only Submit on Behalf of Primary Users',
-    description: 'This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.',
+    title: "Limit Admins to Only Submit on Behalf of Primary Users",
+    description: "This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.",
+    defaultNew: false,
+    default: false
+  }, {
+    key: values.featureKey,
+    widget: true,
+    main: true,
+    hideOnTabNumbers: [],
+    optionKey: values.optionDisableAddressAutoPopulate,
+    type: "toggle",
+    inverseOption: false,
+    title: "Do not auto-fill the user's address",
+    description: "When enabled, the address field will not be pre-filled from the user's profile when submitting a new ".concat(values.textSingularName, ". It must be entered manually each time."),
     defaultNew: false,
     default: false
   }],
@@ -119,20 +132,20 @@ const FeatureConfig = {
     url: values.routeRequestsHub,
     countProps: null,
     visibleExps: {
-      type: 'and',
+      type: "and",
       exps: [{
-        type: 'feature',
+        type: "feature",
         value: values.featureKey
       }, {
-        type: 'or',
+        type: "or",
         exps: [{
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceTracking
         }, {
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceTypes
         }, {
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceAssignment
         }]
       }]
@@ -197,21 +210,21 @@ const FeatureConfig = {
     exact: true
   }],
   env: {
-    baseStage: '',
-    baseAPIUrl: '',
-    baseUploadsUrl: '',
-    uploadBucket: '',
-    colourBrandingMain: '',
-    colourBrandingOff: '',
-    colourBrandingApp: '',
-    defaultProfileImage: '',
-    utcOffset: '',
+    baseStage: "",
+    baseAPIUrl: "",
+    baseUploadsUrl: "",
+    uploadBucket: "",
+    colourBrandingMain: "",
+    colourBrandingOff: "",
+    colourBrandingApp: "",
+    defaultProfileImage: "",
+    utcOffset: "",
     hasAvailableNews: false,
     newsHaveTags: true,
     defaultAllowComments: true,
-    makeApiKey: '',
-    logo: '',
-    clientName: ''
+    makeApiKey: "",
+    logo: "",
+    clientName: ""
   },
   init: environment => {
     FeatureConfig.env = environment;
@@ -563,7 +576,6 @@ const stringActions = Apis$2.stringActions;
 var jobStatusOptions = [
 	{
 		text: "Open",
-		alias: "Unassigned",
 		order: 0,
 		color: "#d5dde4",
 		category: "Not Actioned"
@@ -760,16 +772,15 @@ class JobList extends Component {
       } = this.props;
       const params = {};
 
-      // Status filter: translate "All Incomplete" into the actual incomplete statuses.
-      // Expand each status to include its `alias` so legacy DB values (e.g. "Unassigned"
-      // for "Open") still match the filter.
+      // Status filter: translate "All Incomplete" into the actual incomplete statuses
       if (selectedStatusFilter) {
-        const selectedStatusTypes = selectedStatusFilter === STATUS_IMCOMPLETE ? statusTypes.filter(s => s.category !== STATUS_COMPLETED) : statusTypes.filter(s => s.text === selectedStatusFilter);
-        const expanded = _.uniq(selectedStatusTypes.flatMap(s => s.alias ? [s.text, s.alias] : [s.text]));
-        if (expanded.length > 0) {
-          params.status = expanded.join(',');
-        } else if (selectedStatusFilter !== STATUS_IMCOMPLETE) {
-          // Fallback if the status isn't in statusTypes (shouldn't happen normally)
+        if (selectedStatusFilter === STATUS_IMCOMPLETE) {
+          // Exclude completed statuses - pass all non-completed status texts
+          const incompleteStatuses = statusTypes.filter(s => s.category !== STATUS_COMPLETED).map(s => s.text);
+          if (incompleteStatuses.length > 0) {
+            params.status = incompleteStatuses.join(',');
+          }
+        } else {
           params.status = selectedStatusFilter;
         }
       }
@@ -4281,7 +4292,7 @@ class AddJob extends Component {
           if (response.data.user.phoneNumber) {
             contactUpdate.phone = response.data.user.phoneNumber;
           }
-          if (response.data.user.unit) {
+          if (!this.props.disableAddressAutoPopulate && response.data.user.unit) {
             contactUpdate.room = response.data.user.unit;
           }
           // Update contact fields when data arrives
@@ -5117,7 +5128,8 @@ const mapStateToProps$2 = state => {
   return {
     auth,
     strings: state.strings && state.strings.config || {},
-    optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents)
+    optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents),
+    disableAddressAutoPopulate: Helper$1.getSiteSettingFromState(state, values.optionDisableAddressAutoPopulate)
   };
 };
 var AddJob$1 = connect(mapStateToProps$2, {

package/dist/index.umd.js

@@ -69,6 +69,7 @@
     svgPathGridIconViewBox: '0 0 30 30',
     menuOrder: 10,
     optionOnlyForResidents: 'onlyForResidentsMaintenance',
+    optionDisableAddressAutoPopulate: 'disableAddressAutoPopulateMaintenance',
     textEmptyDescription: 'allows your users to submit Requests (such as maintenance requests) that all appear in this job board.',
     textEmptyExample: 'Example might be; Fix my light bulb, hand rail is broken, or please send flowers to Mum.',
     textEmptyJobTypes: 'Please add the many categories of request types that exist in your village which work alongside the Maintenance area.',
@@ -115,7 +116,7 @@
     key: values.featureKey,
     aliases: values.aliases,
     singularName: values.textSingularName,
-    description: 'Submit maintenance requests and track the progress.',
+    description: "Submit maintenance requests and track the progress.",
     emptyText: values.textYourRequestHere,
     widgetOptions: [{
       key: values.featureKey,
@@ -123,10 +124,22 @@
       main: true,
       hideOnTabNumbers: [],
       optionKey: values.optionOnlyForResidents,
-      type: 'toggle',
+      type: "toggle",
       inverseOption: false,
-      title: 'Limit Admins to Only Submit on Behalf of Primary Users',
-      description: 'This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.',
+      title: "Limit Admins to Only Submit on Behalf of Primary Users",
+      description: "This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.",
+      defaultNew: false,
+      default: false
+    }, {
+      key: values.featureKey,
+      widget: true,
+      main: true,
+      hideOnTabNumbers: [],
+      optionKey: values.optionDisableAddressAutoPopulate,
+      type: "toggle",
+      inverseOption: false,
+      title: "Do not auto-fill the user's address",
+      description: "When enabled, the address field will not be pre-filled from the user's profile when submitting a new ".concat(values.textSingularName, ". It must be entered manually each time."),
       defaultNew: false,
       default: false
     }],
@@ -139,20 +152,20 @@
       url: values.routeRequestsHub,
       countProps: null,
       visibleExps: {
-        type: 'and',
+        type: "and",
         exps: [{
-          type: 'feature',
+          type: "feature",
           value: values.featureKey
         }, {
-          type: 'or',
+          type: "or",
           exps: [{
-            type: 'permission',
+            type: "permission",
             value: values.permissionMaintenanceTracking
           }, {
-            type: 'permission',
+            type: "permission",
             value: values.permissionMaintenanceTypes
           }, {
-            type: 'permission',
+            type: "permission",
             value: values.permissionMaintenanceAssignment
           }]
         }]
@@ -217,21 +230,21 @@
       exact: true
     }],
     env: {
-      baseStage: '',
-      baseAPIUrl: '',
-      baseUploadsUrl: '',
-      uploadBucket: '',
-      colourBrandingMain: '',
-      colourBrandingOff: '',
-      colourBrandingApp: '',
-      defaultProfileImage: '',
-      utcOffset: '',
+      baseStage: "",
+      baseAPIUrl: "",
+      baseUploadsUrl: "",
+      uploadBucket: "",
+      colourBrandingMain: "",
+      colourBrandingOff: "",
+      colourBrandingApp: "",
+      defaultProfileImage: "",
+      utcOffset: "",
       hasAvailableNews: false,
       newsHaveTags: true,
       defaultAllowComments: true,
-      makeApiKey: '',
-      logo: '',
-      clientName: ''
+      makeApiKey: "",
+      logo: "",
+      clientName: ""
     },
     init: environment => {
       FeatureConfig.env = environment;
@@ -583,7 +596,6 @@
   var jobStatusOptions = [
   	{
   		text: "Open",
-  		alias: "Unassigned",
   		order: 0,
   		color: "#d5dde4",
   		category: "Not Actioned"
@@ -780,16 +792,15 @@
         } = this.props;
         const params = {};
 
-        // Status filter: translate "All Incomplete" into the actual incomplete statuses.
-        // Expand each status to include its `alias` so legacy DB values (e.g. "Unassigned"
-        // for "Open") still match the filter.
+        // Status filter: translate "All Incomplete" into the actual incomplete statuses
         if (selectedStatusFilter) {
-          const selectedStatusTypes = selectedStatusFilter === STATUS_IMCOMPLETE ? statusTypes.filter(s => s.category !== STATUS_COMPLETED) : statusTypes.filter(s => s.text === selectedStatusFilter);
-          const expanded = ___default["default"].uniq(selectedStatusTypes.flatMap(s => s.alias ? [s.text, s.alias] : [s.text]));
-          if (expanded.length > 0) {
-            params.status = expanded.join(',');
-          } else if (selectedStatusFilter !== STATUS_IMCOMPLETE) {
-            // Fallback if the status isn't in statusTypes (shouldn't happen normally)
+          if (selectedStatusFilter === STATUS_IMCOMPLETE) {
+            // Exclude completed statuses - pass all non-completed status texts
+            const incompleteStatuses = statusTypes.filter(s => s.category !== STATUS_COMPLETED).map(s => s.text);
+            if (incompleteStatuses.length > 0) {
+              params.status = incompleteStatuses.join(',');
+            }
+          } else {
             params.status = selectedStatusFilter;
           }
         }
@@ -4301,7 +4312,7 @@
             if (response.data.user.phoneNumber) {
               contactUpdate.phone = response.data.user.phoneNumber;
             }
-            if (response.data.user.unit) {
+            if (!this.props.disableAddressAutoPopulate && response.data.user.unit) {
               contactUpdate.room = response.data.user.unit;
             }
             // Update contact fields when data arrives
@@ -5137,7 +5148,8 @@
     return {
       auth,
       strings: state.strings && state.strings.config || {},
-      optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents)
+      optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents),
+      disableAddressAutoPopulate: Helper$1.getSiteSettingFromState(state, values.optionDisableAddressAutoPopulate)
     };
   };
   var AddJob$1 = reactRedux.connect(mapStateToProps$2, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plusscommunities/pluss-maintenance-web",
-	"version": "1.1.38",
+	"version": "1.1.40",
 	"description": "Extension package to enable maintenance on Pluss Communities Platform",
 	"main": "dist/index.cjs.js",
 	"module": "dist/index.esm.js",