Version 2.5.18: user fixes, blink only now, fix for connect loading

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.5.7",
+  "version": "2.5.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.5.7",
+      "version": "2.5.18",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
@@ -32,7 +32,7 @@
         "react-tooltip": "^4.2.21",
         "react-widgets": "^5.1.1",
         "sass": "^1.35.1",
-        "ucentral-libs": "^1.0.56",
+        "ucentral-libs": "^1.0.57",
         "uuid": "^8.3.2"
       },
       "devDependencies": {
@@ -15046,9 +15046,9 @@
       }
     },
     "node_modules/ucentral-libs": {
-      "version": "1.0.56",
+      "version": "1.0.57",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.56.tgz",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.57.tgz",
-      "integrity": "sha512-/j4KpsQ588nvRKu3XYLpVfS07lTx7kq3e6QVTMalG/HGA0rv0CmAbbJdv3ICyDIReGbVdUI7scBKOyK8ZUjG+w==",
+      "integrity": "sha512-3EBNHNasVRFOivvEt53cR+9nqDK6IOZ+vFS2Df+edOS2PEUq6Gg1hYTc2DrUPyRhJjHo7zTdLiDkB+QwZy+OkQ==",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
@@ -28138,9 +28138,9 @@
       }
     },
     "ucentral-libs": {
-      "version": "1.0.56",
+      "version": "1.0.57",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.56.tgz",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.57.tgz",
-      "integrity": "sha512-/j4KpsQ588nvRKu3XYLpVfS07lTx7kq3e6QVTMalG/HGA0rv0CmAbbJdv3ICyDIReGbVdUI7scBKOyK8ZUjG+w==",
+      "integrity": "sha512-3EBNHNasVRFOivvEt53cR+9nqDK6IOZ+vFS2Df+edOS2PEUq6Gg1hYTc2DrUPyRhJjHo7zTdLiDkB+QwZy+OkQ==",
       "requires": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.5.17",
+  "version": "2.5.18",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
@@ -26,7 +26,7 @@
     "react-tooltip": "^4.2.21",
     "react-widgets": "^5.1.1",
     "sass": "^1.35.1",
-    "ucentral-libs": "^1.0.56",
+    "ucentral-libs": "^1.0.57",
     "uuid": "^8.3.2"
   },
   "main": "index.js",

public/locales/de/translation.json

@@ -17,6 +17,7 @@
 		"blink": "LEDs Blinken",
 		"device_leds": "LEDs",
 		"execute_now": "Möchten Sie dieses Muster jetzt einstellen?",
+		"explanation": "Welches Muster möchten Sie auf diesem Gerät für 30 Sekunden einstellen?",
 		"pattern": "Wählen Sie das Muster, das Sie verwenden möchten:",
 		"set_leds": "LEDs einstellen",
 		"when_blink_leds": "Wann möchten Sie die LEDs blinken lassen?"

public/locales/en/translation.json

@@ -17,6 +17,7 @@
 		"blink": "Blink",
 		"device_leds": "Device LEDs",
 		"execute_now": "Would you like to set this pattern now?",
+		"explanation": "What pattern would you like to set on this device for 30 seconds?",
 		"pattern": "LEDs pattern: ",
 		"set_leds": "Set LEDs",
 		"when_blink_leds": "When would you like to make the device LEDs blink?"

public/locales/es/translation.json

@@ -17,6 +17,7 @@
 		"blink": "Parpadeo",
 		"device_leds": "LED de dispositivo",
 		"execute_now": "¿Le gustaría establecer este patrón ahora?",
+		"explanation": "¿Qué patrón le gustaría establecer en este dispositivo durante 30 segundos?",
 		"pattern": "Elija el patrón que le gustaría usar:",
 		"set_leds": "Establecer LED",
 		"when_blink_leds": "¿Cuándo desea que los LED del dispositivo parpadeen?"

public/locales/fr/translation.json

@@ -17,6 +17,7 @@
 		"blink": "Cligner",
 		"device_leds": "LED de l'appareil",
 		"execute_now": "Souhaitez-vous définir ce modèle maintenant ?",
+		"explanation": "Quel modèle souhaitez-vous définir sur cet appareil pendant 30 secondes ?",
 		"pattern": "Choisissez le modèle que vous souhaitez utiliser :",
 		"set_leds": "Définir les LED",
 		"when_blink_leds": "Quand souhaitez-vous faire clignoter les LED de l'appareil ?"

public/locales/pt/translation.json

@@ -17,6 +17,7 @@
 		"blink": "Piscar",
 		"device_leds": "LEDs do dispositivo",
 		"execute_now": "Você gostaria de definir este padrão agora?",
+		"explanation": "Que padrão você gostaria de definir neste dispositivo por 30 segundos?",
 		"pattern": "Escolha o padrão que deseja usar:",
 		"set_leds": "Definir LEDs",
 		"when_blink_leds": "Quando você gostaria de fazer os LEDs do dispositivo piscarem?"

src/components/BlinkModal/index.js

@@ -5,21 +5,18 @@ import {
   CModalTitle,
   CModalBody,
   CModalFooter,
-  CSwitch,
   CCol,
-  CRow,
   CFormGroup,
   CInputRadio,
   CLabel,
   CPopover,
+  CRow,
 } from '@coreui/react';
 import CIcon from '@coreui/icons-react';
 import { cilX } from '@coreui/icons';
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import DatePicker from 'react-widgets/DatePicker';
 import PropTypes from 'prop-types';
-import { dateToUnix } from 'utils/helper';
 import 'react-widgets/styles.css';
 import axiosInstance from 'utils/axiosInstance';
 import eventBus from 'utils/eventBus';
@@ -31,38 +28,24 @@ const BlinkModal = ({ show, toggleModal }) => {
   const { currentToken, endpoints } = useAuth();
   const { deviceSerialNumber } = useDevice();
   const { addToast } = useToast();
-  const [isNow, setIsNow] = useState(false);
   const [waiting, setWaiting] = useState(false);
-  const [chosenDate, setChosenDate] = useState(new Date().toString());
+  const [chosenPattern, setPattern] = useState('blink');
-  const [chosenPattern, setPattern] = useState('on');
   const [result, setResult] = useState(null);
 
-  const toggleNow = () => {
-    setIsNow(!isNow);
-  };
-
-  const setDate = (date) => {
-    if (date) {
-      setChosenDate(date.toString());
-    }
-  };
-
   useEffect(() => {
     if (show) {
       setWaiting(false);
-      setChosenDate(new Date().toString());
+      setPattern('blink');
-      setPattern('on');
       setResult(null);
     }
   }, [show]);
 
   const doAction = () => {
     setWaiting(true);
-    const utcDate = new Date(chosenDate);
 
     const parameters = {
       serialNumber: deviceSerialNumber,
-      when: isNow ? 0 : dateToUnix(utcDate),
+      when: 0,
       pattern: chosenPattern,
       duration: 30,
     };
@@ -113,11 +96,26 @@ const BlinkModal = ({ show, toggleModal }) => {
       ) : (
         <div>
           <CModalBody>
-            <CFormGroup row>
+            <CRow className="mb-3">
+              <CCol>{t('blink.explanation')}</CCol>
+            </CRow>
+            <CFormGroup row className="mb-0">
               <CCol md="3">
                 <CLabel>{t('blink.pattern')}</CLabel>
               </CCol>
               <CCol>
+                <CFormGroup variant="custom-radio" onClick={() => setPattern('blink')} inline>
+                  <CInputRadio
+                    custom
+                    defaultChecked={chosenPattern === 'blink'}
+                    id="radio3"
+                    name="radios"
+                    value="option3"
+                  />
+                  <CLabel variant="custom-checkbox" htmlFor="radio3">
+                    {t('blink.blink')}
+                  </CLabel>
+                </CFormGroup>
                 <CFormGroup variant="custom-radio" onClick={() => setPattern('on')} inline>
                   <CInputRadio
                     custom
@@ -142,55 +140,12 @@ const BlinkModal = ({ show, toggleModal }) => {
                     {t('common.off')}
                   </CLabel>
                 </CFormGroup>
-                <CFormGroup variant="custom-radio" onClick={() => setPattern('blink')} inline>
-                  <CInputRadio
-                    custom
-                    defaultChecked={chosenPattern === 'blink'}
-                    id="radio3"
-                    name="radios"
-                    value="option3"
-                  />
-                  <CLabel variant="custom-checkbox" htmlFor="radio3">
-                    {t('blink.blink')}
-                  </CLabel>
-                </CFormGroup>
               </CCol>
             </CFormGroup>
-            <CRow className="pt-1">
-              <CCol md="8">
-                <p>{t('blink.execute_now')}</p>
-              </CCol>
-              <CCol>
-                <CSwitch
-                  disabled={waiting}
-                  color="primary"
-                  defaultChecked={isNow}
-                  onClick={toggleNow}
-                  labelOn={t('common.yes')}
-                  labelOff={t('common.no')}
-                />
-              </CCol>
-            </CRow>
-            <CRow hidden={isNow} className="pt-3">
-              <CCol md="4" className="pt-2">
-                <p>{t('common.custom_date')}</p>
-              </CCol>
-              <CCol xs="12" md="8">
-                <DatePicker
-                  selected={new Date(chosenDate)}
-                  includeTime
-                  value={new Date(chosenDate)}
-                  placeholder="Select custom date"
-                  disabled={waiting}
-                  onChange={(date) => setDate(date)}
-                  min={new Date()}
-                />
-              </CCol>
-            </CRow>
           </CModalBody>
           <CModalFooter>
             <LoadingButton
-              label={isNow ? t('blink.set_leds') : t('common.schedule')}
+              label={t('blink.set_leds')}
               isLoadingLabel={t('common.loading_ellipsis')}
               isLoading={waiting}
               action={doAction}

src/components/DeviceActionCard/index.js

@@ -22,7 +22,7 @@ const DeviceActions = ({ device }) => {
   const [upgradeStatus, setUpgradeStatus] = useState({
     loading: false,
   });
-  const [connectLoading, setConnectLoading] = useToggle(false);
+  const [connectLoading, setConnectLoading] = useState(false);
   const [showRebootModal, toggleRebootModal] = useToggle(false);
   const [showBlinkModal, toggleBlinkModal] = useToggle(false);
   const [showUpgradeModal, toggleUpgradeModal, setShowUpgradeModal] = useToggle(false);