From de26400390690751faaea2c67620f21f03585d6c Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 16 Mar 2022 20:35:58 +0000 Subject: [PATCH] 2.6.56: createUuid -> uuid --- package-lock.json | 4 +- package.json | 2 +- .../Buttons/FileInputButton/index.js | 6 +- src/components/ColumnPicker/index.js | 6 +- .../ResourcePicker.js | 4 +- src/components/DataTable/index.js | 12 +- src/components/FileInput/index.js | 8 +- .../FileInputFieldModal/FileInputModal.js | 4 +- .../FormFields/ListInputModalField/index.js | 4 +- .../FormFields/SelectField/FastSelectInput.js | 4 +- .../Modals/ConfigurationInUseModal/index.js | 8 +- src/components/NotesTable/index.js | 4 +- src/components/NotifyForms/index.js | 125 ------------------ .../ConfigurationViewAffectedModal/index.js | 4 +- .../CreateConfigurationModal/Form.js | 8 +- .../Tables/ConfigurationTable/index.js | 4 +- .../ContactTable/AssignContactModal/index.js | 6 +- .../ContactTable/CreateContactModal/Form.js | 8 +- .../ContactTable/EditContactModal/Form.js | 8 +- src/components/Tables/ContactTable/index.js | 4 +- src/components/Tables/EntityTable/index.js | 4 +- .../InventoryTable/AssignTagModal/index.js | 8 +- .../InventoryTable/CreateTagModal/Form.js | 8 +- .../ComputedConfigurationDisplay.js | 4 +- .../InventoryTable/EditTagModal/Form.js | 10 +- .../SpecialConfigurationForm.js | 6 +- .../ImportDeviceCsvModal/index.js | 6 +- .../AssignLocationModal/index.js | 6 +- .../LocationTable/CreateLocationModal/Form.js | 8 +- .../LocationTable/EditLocationModal/Form.js | 8 +- src/components/Tables/LocationTable/index.js | 4 +- .../VenueTable/CreateVenueModal/Form.js | 8 +- src/components/Tables/VenueTable/index.js | 4 +- src/layout/Sidebar/CreateLinks.js | 6 +- src/layout/Sidebar/EntityPopover.js | 12 +- src/layout/Sidebar/NavLinkButton.js | 4 +- src/layout/index.js | 4 +- src/pages/AccountPage/AccountCard/Form.js | 16 +-- .../AccountCard/MfaSelectField/index.js | 10 +- .../GlobalsSection/index.js | 6 +- .../ImportConfigurationButton/Modal.js | 6 +- .../InterfaceSection/index.js | 6 +- .../MetricsSection/index.js | 6 +- .../RadiosSection/ChannelPicker.js | 4 +- .../RadiosSection/index.js | 6 +- .../ServicesSection/index.js | 6 +- .../ConfigurationCard/Form.js | 6 +- .../ConfigurationCard/index.js | 4 +- src/pages/ConfigurationsPage/Table/Actions.js | 4 +- src/pages/ConfigurationsPage/Table/index.js | 6 +- src/pages/ContactsPage/Table/Actions.js | 4 +- src/pages/ContactsPage/Table/index.js | 6 +- .../EntityPage/CreateEntityModal/Form.js | 8 +- src/pages/EntityPage/EntityCard/Form.js | 8 +- .../EntityChildrenTableWrapper/index.js | 4 +- .../EntityConfigurationsTableWrapper/index.js | 4 +- .../EntityContactTableWrapper /Actions.js | 4 +- .../EntityContactTableWrapper /index.js | 4 +- .../EntityDeviceTableWrapper/Actions.js | 6 +- .../EntityDeviceTableWrapper/index.js | 4 +- .../EntityLocationTableWrapper /Actions.js | 4 +- .../EntityLocationTableWrapper /index.js | 4 +- .../EntityVenueTableWrapper/index.js | 4 +- src/pages/InventoryPage/Table/Actions.js | 4 +- src/pages/InventoryPage/Table/index.js | 6 +- src/pages/LocationsPage/Table/Actions.js | 4 +- src/pages/LocationsPage/Table/index.js | 6 +- .../MapDisplayCard/CreateMapButton/Form.js | 8 +- .../MapDisplayCard/Map/DeviceNode/index.js | 4 +- .../MapCard/MapDisplayCard/Map/EntityNode.js | 6 +- .../MapCard/MapDisplayCard/Map/VenueNode.js | 4 +- src/pages/ResourcesPage/Table/Actions.js | 4 +- .../InterfaceSsidRadius/index.js | 8 +- .../InterfaceSsidRadius/index.js | 8 +- src/pages/ResourcesPage/Table/index.js | 11 +- .../SubscriberPage/SubscriberCard/Form.js | 8 +- .../SubscriberDeviceTableWrapper/Actions.js | 6 +- .../SubscriberDeviceTableWrapper/index.js | 4 +- src/pages/SubscribersPage/Table/Actions.js | 4 +- .../Table/CreateSubscriberModal/Form.js | 12 +- .../Table/EditSubscriberModal/Form.js | 12 +- src/pages/SubscribersPage/Table/index.js | 6 +- .../UsersPage/Table/CreateUserModal/Form.js | 8 +- .../UsersPage/Table/EditUserModal/Form.js | 8 +- src/pages/UsersPage/Table/UserActions.js | 4 +- src/pages/UsersPage/Table/index.js | 6 +- src/pages/VenuePage/VenueCard/Form.js | 8 +- .../VenueChildrenTableWrapper/index.js | 4 +- .../VenueConfigurationsTableWrapper/index.js | 4 +- .../VenueContactTableWrapper/Actions.js | 4 +- .../VenueContactTableWrapper/index.js | 4 +- .../VenueDeviceTableWrapper/Actions.js | 6 +- .../VenueDeviceTableWrapper/index.js | 4 +- src/utils/toastHelper.js | 6 +- 94 files changed, 277 insertions(+), 407 deletions(-) delete mode 100644 src/components/NotifyForms/index.js diff --git a/package-lock.json b/package-lock.json index fcfba1e..12a0164 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "wlan-cloud-owprov-ui", - "version": "2.6.55", + "version": "2.6.56", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "wlan-cloud-owprov-ui", - "version": "2.6.55", + "version": "2.6.56", "license": "ISC", "dependencies": { "@chakra-ui/icons": "^1.1.1", diff --git a/package.json b/package.json index 1dddfd0..945c7db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wlan-cloud-owprov-ui", - "version": "2.6.55", + "version": "2.6.56", "description": "", "main": "index.js", "scripts": { diff --git a/src/components/Buttons/FileInputButton/index.js b/src/components/Buttons/FileInputButton/index.js index 5628e5b..9acea76 100644 --- a/src/components/Buttons/FileInputButton/index.js +++ b/src/components/Buttons/FileInputButton/index.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { FormControl, Input, InputGroup } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; const propTypes = { value: PropTypes.string.isRequired, @@ -27,7 +27,7 @@ const FileInputButton = ({ isHidden, isStringFile, }) => { - const [fileKey, setFileKey] = useState(createUuid()); + const [fileKey, setFileKey] = useState(uuid()); let fileReader; const handleStringFileRead = () => { @@ -52,7 +52,7 @@ const FileInputButton = ({ }; useEffect(() => { - if (value === '') setFileKey(createUuid()); + if (value === '') setFileKey(uuid()); }, [refreshId, value]); return ( diff --git a/src/components/ColumnPicker/index.js b/src/components/ColumnPicker/index.js index 18c7a58..9e7bb57 100644 --- a/src/components/ColumnPicker/index.js +++ b/src/components/ColumnPicker/index.js @@ -1,6 +1,6 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useTranslation } from 'react-i18next'; import { Button, @@ -53,7 +53,7 @@ const ColumnPicker = ({ preference, columns, hiddenColumns, setHiddenColumns }) {columns.map((column) => ( handleColumnClick(column.id)} > @@ -78,7 +78,7 @@ const ColumnPicker = ({ preference, columns, hiddenColumns, setHiddenColumns }) {columns.map((column) => ( handleColumnClick(column.id)} > diff --git a/src/components/CustomFields/ConfigurationResourcePicker/ResourcePicker.js b/src/components/CustomFields/ConfigurationResourcePicker/ResourcePicker.js index 6f1e62a..ddc18a7 100644 --- a/src/components/CustomFields/ConfigurationResourcePicker/ResourcePicker.js +++ b/src/components/CustomFields/ConfigurationResourcePicker/ResourcePicker.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import isEqual from 'react-fast-compare'; import { Select } from '@chakra-ui/react'; import { useTranslation } from 'react-i18next'; @@ -24,7 +24,7 @@ const ResourcePicker = ({ value, resources, isDisabled, onChange }) => { - - {' '} - } - type="submit" - isDisabled={!isValid || !dirty} - onClick={submitForm} - /> - - - {errors.emailToNotify} - - )} - - - )} - - SmsNotificationSchema(t)} - onSubmit={({ phone }, { resetForm }) => { - setNotifySms((value) => [...value, phone[0] === '+' ? phone : `+${phone}`]); - resetForm(); - }} - > - {({ errors, touched, isValid, dirty, submitForm }) => ( -
- - {({ field }) => ( - - - {t('batch.phones_to_notify')}: - -

{notifySms.map((phone, index) => `${index > 0 ? ', ' : ''}${phone}`)}

- - - - {' '} - } - type="submit" - isDisabled={!isValid || !dirty} - onClick={submitForm} - /> - - - {errors.phone} -
- )} -
-
- )} -
- - ); -}; - -NotifyForms.propTypes = propTypes; - -export default NotifyForms; diff --git a/src/components/Tables/ConfigurationTable/ConfigurationViewAffectedModal/index.js b/src/components/Tables/ConfigurationTable/ConfigurationViewAffectedModal/index.js index 093ad67..298b46a 100644 --- a/src/components/Tables/ConfigurationTable/ConfigurationViewAffectedModal/index.js +++ b/src/components/Tables/ConfigurationTable/ConfigurationViewAffectedModal/index.js @@ -12,7 +12,7 @@ import { ListItem, Heading, } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useTranslation } from 'react-i18next'; import CloseButton from 'components/Buttons/CloseButton'; import ModalHeader from 'components/ModalHeader'; @@ -58,7 +58,7 @@ const ConfigurationViewAffectedModal = ({ isOpen, onClose, config }) => { {affected?.map((dev) => ( - + {dev} ))} diff --git a/src/components/Tables/ConfigurationTable/CreateConfigurationModal/Form.js b/src/components/Tables/ConfigurationTable/CreateConfigurationModal/Form.js index da30cd7..4486bc8 100644 --- a/src/components/Tables/ConfigurationTable/CreateConfigurationModal/Form.js +++ b/src/components/Tables/ConfigurationTable/CreateConfigurationModal/Form.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useToast, SimpleGrid } from '@chakra-ui/react'; import { Formik } from 'formik'; import { CreateConfigurationSchema } from 'constants/formSchemas'; @@ -39,7 +39,7 @@ const CreateConfigurationForm = ({ }) => { const { t } = useTranslation(); const toast = useToast(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const { data: entities } = useGetEntities({ t, toast }); const { data: venues } = useGetVenues({ t, toast }); @@ -70,7 +70,7 @@ const CreateConfigurationForm = ({ }); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -108,7 +108,7 @@ const CreateConfigurationForm = ({ }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_create_obj', { obj: t('configurations.one'), diff --git a/src/components/Tables/ConfigurationTable/index.js b/src/components/Tables/ConfigurationTable/index.js index 53dd998..2150e49 100644 --- a/src/components/Tables/ConfigurationTable/index.js +++ b/src/components/Tables/ConfigurationTable/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import DataTable from 'components/DataTable'; import { useTranslation } from 'react-i18next'; import { useToast } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import FormattedDate from 'components/FormattedDate'; import { useGetSelectConfigurations } from 'hooks/Network/Configurations'; @@ -18,7 +18,7 @@ const ConfigurationsTable = ({ select, actions }) => { const { data: configurations, isFetching } = useGetSelectConfigurations({ t, toast, select }); const dateCell = useCallback( - (cell, key) => , + (cell, key) => , [], ); const typesCell = useCallback((cell) => cell.row.values.deviceTypes.join(', '), []); diff --git a/src/components/Tables/ContactTable/AssignContactModal/index.js b/src/components/Tables/ContactTable/AssignContactModal/index.js index 4e7ae7d..e8f79c5 100644 --- a/src/components/Tables/ContactTable/AssignContactModal/index.js +++ b/src/components/Tables/ContactTable/AssignContactModal/index.js @@ -1,6 +1,6 @@ import React, { useCallback, useState } from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { Button, useDisclosure, @@ -79,7 +79,7 @@ const AssignContactModal = ({ entityId, venueId, alreadyClaimed }) => { onSuccess: ({ claimErrors }) => { if (claimErrors.length > 0) { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('common.error_claiming_obj'), status: 'error', @@ -106,7 +106,7 @@ const AssignContactModal = ({ entityId, venueId, alreadyClaimed }) => { }, onError: () => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('common.error_claiming_obj'), status: 'error', diff --git a/src/components/Tables/ContactTable/CreateContactModal/Form.js b/src/components/Tables/ContactTable/CreateContactModal/Form.js index 7346516..c1dfde4 100644 --- a/src/components/Tables/ContactTable/CreateContactModal/Form.js +++ b/src/components/Tables/ContactTable/CreateContactModal/Form.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useToast, SimpleGrid } from '@chakra-ui/react'; import { Formik, Form } from 'formik'; import { CreateContactSchema } from 'constants/formSchemas'; @@ -26,7 +26,7 @@ const propTypes = { const CreateContactForm = ({ isOpen, onClose, refresh, formRef, parent }) => { const { t } = useTranslation(); const toast = useToast(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const { data: entities } = useGetEntities({ t, toast }); const { data: venues } = useGetVenues({ t, toast }); const queryClient = useQueryClient(); @@ -34,7 +34,7 @@ const CreateContactForm = ({ isOpen, onClose, refresh, formRef, parent }) => { const create = useCreateContact(); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -122,7 +122,7 @@ const CreateContactForm = ({ isOpen, onClose, refresh, formRef, parent }) => { }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_create_obj', { obj: t('contacts.one'), diff --git a/src/components/Tables/ContactTable/EditContactModal/Form.js b/src/components/Tables/ContactTable/EditContactModal/Form.js index a6e62f3..971c990 100644 --- a/src/components/Tables/ContactTable/EditContactModal/Form.js +++ b/src/components/Tables/ContactTable/EditContactModal/Form.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useToast, Tabs, TabList, TabPanels, TabPanel, Tab, SimpleGrid } from '@chakra-ui/react'; import { Formik, Field, Form } from 'formik'; import NotesTable from 'components/NotesTable'; @@ -26,12 +26,12 @@ const propTypes = { const EditContactForm = ({ editing, isOpen, onClose, refresh, contact, formRef }) => { const { t } = useTranslation(); const toast = useToast(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const { data: entities } = useGetEntities({ t, toast }); const updateContact = useUpdateContact({ id: contact.id }); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -100,7 +100,7 @@ const EditContactForm = ({ editing, isOpen, onClose, refresh, contact, formRef } }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_update_obj', { obj: t('contacts.one'), diff --git a/src/components/Tables/ContactTable/index.js b/src/components/Tables/ContactTable/index.js index c59fa61..decc2e2 100644 --- a/src/components/Tables/ContactTable/index.js +++ b/src/components/Tables/ContactTable/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import DataTable from 'components/DataTable'; import { useTranslation } from 'react-i18next'; import { useToast } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import FormattedDate from 'components/FormattedDate'; import { useGetSelectContacts } from 'hooks/Network/Contacts'; @@ -27,7 +27,7 @@ const ContactTable = ({ actions, select, ignoredColumns, refreshId, disabledIds const { data: venues, isFetching, refetch } = useGetSelectContacts({ t, toast, select }); const memoizedDate = useCallback( - (cell, key) => , + (cell, key) => , [], ); diff --git a/src/components/Tables/EntityTable/index.js b/src/components/Tables/EntityTable/index.js index a84230f..786ea9e 100644 --- a/src/components/Tables/EntityTable/index.js +++ b/src/components/Tables/EntityTable/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import DataTable from 'components/DataTable'; import { useTranslation } from 'react-i18next'; import { useToast } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import FormattedDate from 'components/FormattedDate'; import { useGetSelectEntities } from 'hooks/Network/Entity'; @@ -18,7 +18,7 @@ const EntityTable = ({ actions, select }) => { const { data: entities, isFetching } = useGetSelectEntities({ t, toast, select }); const dateCell = useCallback( - (cell, key) => , + (cell, key) => , [], ); diff --git a/src/components/Tables/InventoryTable/AssignTagModal/index.js b/src/components/Tables/InventoryTable/AssignTagModal/index.js index 584f67a..eb01141 100644 --- a/src/components/Tables/InventoryTable/AssignTagModal/index.js +++ b/src/components/Tables/InventoryTable/AssignTagModal/index.js @@ -1,6 +1,6 @@ import React, { useCallback, useState } from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { Button, useDisclosure, @@ -77,7 +77,7 @@ const AssignTagModal = ({ entityId, alreadyClaimedDevices }) => { onSuccess: ({ claimErrors, unassignErrors }) => { if (unassignErrors.length > 0) { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('subscribers.error_removing_claim', { serials: unassignErrors.join(','), @@ -89,7 +89,7 @@ const AssignTagModal = ({ entityId, alreadyClaimedDevices }) => { }); } else if (claimErrors.length > 0) { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('subscribers.error_claiming', { serials: claimErrors.join(','), @@ -121,7 +121,7 @@ const AssignTagModal = ({ entityId, alreadyClaimedDevices }) => { }, onError: () => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('subscribers.error_claiming', { serials: serialNumbers.join(','), diff --git a/src/components/Tables/InventoryTable/CreateTagModal/Form.js b/src/components/Tables/InventoryTable/CreateTagModal/Form.js index 7aea5d9..703979e 100644 --- a/src/components/Tables/InventoryTable/CreateTagModal/Form.js +++ b/src/components/Tables/InventoryTable/CreateTagModal/Form.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useToast, SimpleGrid } from '@chakra-ui/react'; import { Formik, Form } from 'formik'; import { CreateTagSchema } from 'constants/formSchemas'; @@ -43,7 +43,7 @@ const CreateTagForm = ({ }) => { const { t } = useTranslation(); const toast = useToast(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const { data: entities } = useGetEntities({ t, toast }); const { data: venues } = useGetVenues({ t, toast }); @@ -77,7 +77,7 @@ const CreateTagForm = ({ }); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -126,7 +126,7 @@ const CreateTagForm = ({ }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_create_obj', { obj: t('certificates.device'), diff --git a/src/components/Tables/InventoryTable/EditTagModal/ComputedConfigurationDisplay.js b/src/components/Tables/InventoryTable/EditTagModal/ComputedConfigurationDisplay.js index 4d6ccba..489a169 100644 --- a/src/components/Tables/InventoryTable/EditTagModal/ComputedConfigurationDisplay.js +++ b/src/components/Tables/InventoryTable/EditTagModal/ComputedConfigurationDisplay.js @@ -13,7 +13,7 @@ import { AccordionPanel, Center, } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; const propTypes = { computedConfig: PropTypes.shape({ @@ -48,7 +48,7 @@ const ComputedConfigurationDisplay = ({ computedConfig }) => { {computedConfig.explanation?.map((exp) => ( - + { const { t } = useTranslation(); const toast = useToast(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const { data: entities } = useGetEntities({ t, toast }); const { data: venues } = useGetVenues({ t, toast }); const updateConfiguration = useUpdateConfiguration({ id: tag.deviceConfiguration }); @@ -70,7 +70,7 @@ const EditTagForm = ({ }; useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -130,7 +130,7 @@ const EditTagForm = ({ }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_update_obj', { obj: t('configurations.one'), @@ -169,7 +169,7 @@ const EditTagForm = ({ }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_update_obj', { obj: t('inventory.tag_one'), diff --git a/src/components/Tables/InventoryTable/EditTagModal/SpecialConfigurationManager/SpecialConfigurationForm.js b/src/components/Tables/InventoryTable/EditTagModal/SpecialConfigurationManager/SpecialConfigurationForm.js index e1ddf41..65145f0 100644 --- a/src/components/Tables/InventoryTable/EditTagModal/SpecialConfigurationManager/SpecialConfigurationForm.js +++ b/src/components/Tables/InventoryTable/EditTagModal/SpecialConfigurationManager/SpecialConfigurationForm.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { Formik } from 'formik'; import { SimpleGrid } from '@chakra-ui/react'; import { useTranslation } from 'react-i18next'; @@ -22,10 +22,10 @@ const defaultProps = { const SpecialConfigurationForm = ({ editing, configuration, formRef }) => { const { t } = useTranslation(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [editing]); return ( diff --git a/src/components/Tables/InventoryTable/ImportDeviceCsvModal/index.js b/src/components/Tables/InventoryTable/ImportDeviceCsvModal/index.js index 56196cb..9f79c8d 100644 --- a/src/components/Tables/InventoryTable/ImportDeviceCsvModal/index.js +++ b/src/components/Tables/InventoryTable/ImportDeviceCsvModal/index.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useDisclosure, Modal, @@ -37,7 +37,7 @@ const defaultProps = { const ImportDeviceCsvModal = ({ refresh, deviceClass, parent }) => { const { t } = useTranslation(); const breakpoint = useBreakpoint(); - const [refreshId, setRefreshId] = useState(createUuid()); + const [refreshId, setRefreshId] = useState(uuid()); // 0: explanation, file import and file analysis // 1: testing the serial number list with the API // 2: do the POSTs and PUTs necessary, show the results @@ -84,7 +84,7 @@ const ImportDeviceCsvModal = ({ refresh, deviceClass, parent }) => { const openModal = () => { setPhase(0); - setRefreshId(createUuid()); + setRefreshId(uuid()); setIsCloseable(true); setDevicesToTest([]); setDevicesToImport([]); diff --git a/src/components/Tables/LocationTable/AssignLocationModal/index.js b/src/components/Tables/LocationTable/AssignLocationModal/index.js index 3dfaae8..e881d35 100644 --- a/src/components/Tables/LocationTable/AssignLocationModal/index.js +++ b/src/components/Tables/LocationTable/AssignLocationModal/index.js @@ -1,6 +1,6 @@ import React, { useCallback, useState } from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { Button, useDisclosure, @@ -77,7 +77,7 @@ const AssignLocationModal = ({ entityId, alreadyClaimed }) => { onSuccess: ({ claimErrors }) => { if (claimErrors.length > 0) { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('common.error_claiming_obj'), status: 'error', @@ -104,7 +104,7 @@ const AssignLocationModal = ({ entityId, alreadyClaimed }) => { }, onError: () => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('common.error_claiming_obj'), status: 'error', diff --git a/src/components/Tables/LocationTable/CreateLocationModal/Form.js b/src/components/Tables/LocationTable/CreateLocationModal/Form.js index a9a98ee..f286716 100644 --- a/src/components/Tables/LocationTable/CreateLocationModal/Form.js +++ b/src/components/Tables/LocationTable/CreateLocationModal/Form.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useToast, SimpleGrid } from '@chakra-ui/react'; import { Formik, Form } from 'formik'; import { CreateLocationSchema } from 'constants/formSchemas'; @@ -30,14 +30,14 @@ const defaultProps = { const CreateLocationForm = ({ isOpen, onClose, refresh, formRef, entityId }) => { const { t } = useTranslation(); const toast = useToast(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const { data: entities } = useGetEntities({ t, toast }); const queryClient = useQueryClient(); const create = useCreateLocation(); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -123,7 +123,7 @@ const CreateLocationForm = ({ isOpen, onClose, refresh, formRef, entityId }) => }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_create_obj', { obj: t('locations.one'), diff --git a/src/components/Tables/LocationTable/EditLocationModal/Form.js b/src/components/Tables/LocationTable/EditLocationModal/Form.js index 2c6e854..d2a3352 100644 --- a/src/components/Tables/LocationTable/EditLocationModal/Form.js +++ b/src/components/Tables/LocationTable/EditLocationModal/Form.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useToast, Tabs, TabList, TabPanels, TabPanel, Tab, SimpleGrid } from '@chakra-ui/react'; import { Formik, Field, Form } from 'formik'; import NotesTable from 'components/NotesTable'; @@ -28,12 +28,12 @@ const propTypes = { const EditLocationForm = ({ editing, isOpen, onClose, refresh, location, formRef }) => { const { t } = useTranslation(); const toast = useToast(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const { data: entities } = useGetEntities({ t, toast }); const updateLocation = useUpdateLocation({ id: location.id }); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -105,7 +105,7 @@ const EditLocationForm = ({ editing, isOpen, onClose, refresh, location, formRef }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_update_obj', { obj: t('locations.one'), diff --git a/src/components/Tables/LocationTable/index.js b/src/components/Tables/LocationTable/index.js index 0ce5a99..cc4a583 100644 --- a/src/components/Tables/LocationTable/index.js +++ b/src/components/Tables/LocationTable/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import DataTable from 'components/DataTable'; import { useTranslation } from 'react-i18next'; import { useToast } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import FormattedDate from 'components/FormattedDate'; import { useGetSelectLocations } from 'hooks/Network/Locations'; @@ -26,7 +26,7 @@ const LocationTable = ({ actions, select, refreshId, ignoredColumns, disabledIds const { data: venues, isFetching, refetch } = useGetSelectLocations({ t, toast, select }); const memoizedDate = useCallback( - (cell, key) => , + (cell, key) => , [], ); diff --git a/src/components/Tables/VenueTable/CreateVenueModal/Form.js b/src/components/Tables/VenueTable/CreateVenueModal/Form.js index ec5f112..044cb67 100644 --- a/src/components/Tables/VenueTable/CreateVenueModal/Form.js +++ b/src/components/Tables/VenueTable/CreateVenueModal/Form.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useToast, SimpleGrid } from '@chakra-ui/react'; import { Formik, Form } from 'formik'; import { EntitySchema } from 'constants/formSchemas'; @@ -25,7 +25,7 @@ const CreateVenueForm = ({ isOpen, onClose, formRef, parentId, entityId }) => { const toast = useToast(); const queryClient = useQueryClient(); const navigate = useNavigate(); - const [formKey, setFormKey] = useState(createUuid()); + const [formKey, setFormKey] = useState(uuid()); const create = useCreateVenue(); const createParameters = ({ name, description, note, rrm, location }) => ({ @@ -39,7 +39,7 @@ const CreateVenueForm = ({ isOpen, onClose, formRef, parentId, entityId }) => { }); useEffect(() => { - setFormKey(createUuid()); + setFormKey(uuid()); }, [isOpen]); return ( @@ -88,7 +88,7 @@ const CreateVenueForm = ({ isOpen, onClose, formRef, parentId, entityId }) => { }, onError: (e) => { toast({ - id: createUuid(), + id: uuid(), title: t('common.error'), description: t('crud.error_create_obj', { obj: t('venues.one'), diff --git a/src/components/Tables/VenueTable/index.js b/src/components/Tables/VenueTable/index.js index 432b783..477db18 100644 --- a/src/components/Tables/VenueTable/index.js +++ b/src/components/Tables/VenueTable/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import DataTable from 'components/DataTable'; import { useTranslation } from 'react-i18next'; import { useToast } from '@chakra-ui/react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import FormattedDate from 'components/FormattedDate'; import { useGetSelectVenues } from 'hooks/Network/Venues'; @@ -18,7 +18,7 @@ const VenueTable = ({ actions, select }) => { const { data: venues, isFetching } = useGetSelectVenues({ t, toast, select }); const memoizedDate = useCallback( - (cell, key) => , + (cell, key) => , [], ); diff --git a/src/layout/Sidebar/CreateLinks.js b/src/layout/Sidebar/CreateLinks.js index 8aa0a5d..734acff 100644 --- a/src/layout/Sidebar/CreateLinks.js +++ b/src/layout/Sidebar/CreateLinks.js @@ -1,5 +1,5 @@ import React from 'react'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import EntityNavButton from './EntityNavButton'; import NavLinkButton from './NavLinkButton'; @@ -7,14 +7,14 @@ const createLinks = (routes, activeRoute, role, toggleSidebar = () => {}) => routes.map((route) => route.isEntity ? ( ) : ( - + ), ); diff --git a/src/layout/Sidebar/EntityPopover.js b/src/layout/Sidebar/EntityPopover.js index 9d8a505..a36feb2 100644 --- a/src/layout/Sidebar/EntityPopover.js +++ b/src/layout/Sidebar/EntityPopover.js @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useState } from 'react'; import PropTypes from 'prop-types'; -import { v4 as createUuid } from 'uuid'; +import { v4 as uuid } from 'uuid'; import { useTranslation } from 'react-i18next'; import { Button, @@ -57,7 +57,7 @@ const renderList = (tree, depth, goTo) => { } return ( - {tree.name} + {tree.name} ); } @@ -68,7 +68,7 @@ const renderList = (tree, depth, goTo) => { if (childrenLength === 0) return ( - +