removed hardcoded share limit #451

ruuvi · Oct 21, 2024 · 3beab8f · 3beab8f
1 parent 26681cb
commit 3beab8f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,6 @@
     "alertDescriptionMaxLength": 100,
     "dataFetchPaginationSize": 1500,
     "dataCacheLengthInDays": 730,
-    "maxSharesPerSensor": 10,
     "uploadImageMaxSize": 3000
   },
   "private": true,

diff --git a/src/components/ShareDialog.jsx b/src/components/ShareDialog.jsx
@@ -74,7 +74,7 @@ class ShareDialog extends Component {
         this.setState({ ...this.state, email: evt.target.value });
     }
     isInvalidValid = () => {
-        return this.state.loading || this.props.sensor.sharedTo.length >= pjson.settings.maxSharesPerSensor || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(this.state.email)
+        return this.state.loading || this.props.sensor.sharedTo.length >= this.props.sensor.subscription.maxSharesPerSensor || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(this.state.email)
     }
     keyDown = (e) => {
         if (e.key === 'Enter') {
@@ -96,7 +96,7 @@ class ShareDialog extends Component {
                         <Button disabled={this.isInvalidValid()} onClick={this.share.bind(this)} mt="17px">{t("share")}</Button>
                     </div>
                     {this.props.sensor.sharedTo.length > 0 && <>
-                        <div style={{ fontWeight: "bold", marginTop: 8, marginBottom: 8 }}>{addVariablesInString(t("share_sensor_already_shared"), [this.props.sensor.sharedTo.length, pjson.settings.maxSharesPerSensor])}</div>
+                        <div style={{ fontWeight: "bold", marginTop: 8, marginBottom: 8 }}>{addVariablesInString(t("share_sensor_already_shared"), [this.props.sensor.sharedTo.length, this.props.sensor.subscription.maxSharesPerSensor])}</div>
                         <List spacing={3}>
                             {this.props.sensor.sharedTo.map(x => {
                                 return <ListItem key={x}>

diff --git a/src/states/Sensor.jsx b/src/states/Sensor.jsx
@@ -650,7 +650,7 @@ class Sensor extends Component {
                                                                 {t("share")}
                                                             </td>
                                                             <td style={detailedText}>
-                                                                {addVariablesInString(t("shared_to_x"), [this.props.sensor.sharedTo.length, pjson.settings.maxSharesPerSensor])}
+                                                                {addVariablesInString(t("shared_to_x"), [this.props.sensor.sharedTo.length, this.props.sensor.subscription.maxSharesPerSensor])}
                                                                 <IconButton variant="ghost" icon={<MdChevronRight />} _hover={{}} />
                                                             </td>
                                                         </tr>

diff --git a/src/states/ShareCenter.jsx b/src/states/ShareCenter.jsx
@@ -45,7 +45,7 @@ const SensorsSharedByMeBox = (props) => {
                 {props.sensor.name || props.sensor.sensor}
             </div>
             <div style={{ fontFamily: "mulish", paddingBottom: 4, fontSize: 14 }}>
-                {i18next.t("active_shares")} ({props.sensor.sharedTo.length}/{pjson.settings.maxSharesPerSensor})
+                {i18next.t("active_shares")} ({props.sensor.sharedTo.length}/{props.sensor.subscription.maxSharesPerSensor})
             </div>
             <Flex gap='2' wrap="wrap" >
                 {props.sensor.sharedTo.map((sharedWith, index) => (
@@ -128,7 +128,7 @@ const ShareCenter = () => {
     }
 
     let mySensors = sensors.filter(x => x.userIsOwner)
-    let sensorsThatCanBeShared = mySensors.filter(x => x.sharedTo.length < pjson.settings.maxSharesPerSensor)
+    let sensorsThatCanBeShared = mySensors.filter(x => x.sharedTo.length < x.subscription.maxSharesPerSensor)
     sensorsThatCanBeShared = sensorsThatCanBeShared.filter(sensor => !selectedSensors.includes(sensor.sensor));
 
     const selectSensorTitle = <div style={{ marginTop: 8, paddingRight: 8, fontWeight: 800, fontFamily: "mulish" }}>{i18next.t("sensors_select_label")}</div>