From 495a124884c078352ac61f0e657ad24e16276db5 Mon Sep 17 00:00:00 2001
From: Charles <charles.bourque96@gmail.com>
Date: Mon, 22 Nov 2021 16:58:55 -0500
Subject: [PATCH] Version 1.0.39

---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 src/components/DeviceBadge/index.js           |   3 +-
 .../DuplicateEntityMapForm/index.js           | 100 ++++++++++++++++++
 src/index.js                                  |   1 +
 5 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 src/components/DuplicateEntityMapForm/index.js

diff --git a/package-lock.json b/package-lock.json
index 6ac4d69..d6d2680 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-libs",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-libs",
-      "version": "1.0.37",
+      "version": "1.0.39",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
diff --git a/package.json b/package.json
index 3299c21..55cec73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-libs",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "main": "dist/index.js",
   "source": "src/index.js",
   "engines": {
diff --git a/src/components/DeviceBadge/index.js b/src/components/DeviceBadge/index.js
index 777ee7d..7d420cb 100644
--- a/src/components/DeviceBadge/index.js
+++ b/src/components/DeviceBadge/index.js
@@ -21,6 +21,7 @@ const DeviceBadge = ({ t, device, deviceIcons }) => {
         setSrc(deviceIcons.iotIcon);
         break;
       default:
+        setSrc(deviceIcons.apIcon);
         break;
     }
   };
@@ -49,7 +50,7 @@ const DeviceBadge = ({ t, device, deviceIcons }) => {
         style={{ height: '35px', width: '35px' }}
         className={`c-avatar c-avatar-lg ${getCertColor()}`}
       >
-        <img src={src} className={styles.icon} alt={device.deviceType} />
+        <img src={src} className={styles.icon} alt="" />
         <CPopover content={device.connected ? t('common.connected') : t('common.not_connected')}>
           <span
             className={
diff --git a/src/components/DuplicateEntityMapForm/index.js b/src/components/DuplicateEntityMapForm/index.js
new file mode 100644
index 0000000..e9d339e
--- /dev/null
+++ b/src/components/DuplicateEntityMapForm/index.js
@@ -0,0 +1,100 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  CForm,
+  CInput,
+  CLabel,
+  CCol,
+  CFormGroup,
+  CInvalidFeedback,
+  CFormText,
+  CRow,
+  CSelect,
+} from '@coreui/react';
+
+const DuplicateEntityMapForm = ({ t, disable, fields, updateField }) => (
+  <CForm>
+    <CFormGroup row className="pb-3">
+      <CLabel col htmlFor="name">
+        {t('user.name')}
+      </CLabel>
+      <CCol sm="7">
+        <CInput
+          id="name"
+          type="text"
+          required
+          value={fields.name.value}
+          onChange={updateField}
+          invalid={fields.name.error}
+          disabled={disable}
+          maxLength="50"
+        />
+        <CFormText color={fields.name.error ? 'danger' : ''}>{t('common.required')}</CFormText>
+      </CCol>
+    </CFormGroup>
+    <CFormGroup row className="pb-3">
+      <CLabel col htmlFor="description">
+        {t('user.description')}
+      </CLabel>
+      <CCol sm="7">
+        <CInput
+          id="description"
+          type="text"
+          required
+          value={fields.description.value}
+          onChange={updateField}
+          invalid={fields.description.error}
+          disabled={disable}
+          maxLength="50"
+        />
+        <CInvalidFeedback>{t('common.required')}</CInvalidFeedback>
+      </CCol>
+    </CFormGroup>
+    <CRow className="pb-3">
+      <CLabel col htmlFor="visibility">
+        <div>{t('common.visibility')}:</div>
+      </CLabel>
+      <CCol sm="7">
+        <CSelect
+          custom
+          id="visibility"
+          type="text"
+          required
+          value={fields.visibility.value}
+          onChange={updateField}
+          invalid={fields.visibility.error}
+          disabled={disable}
+          maxLength="50"
+        >
+          <option value="public">public</option>
+          <option value="private">private</option>
+        </CSelect>
+      </CCol>
+    </CRow>
+    <CFormGroup row className="pb-3">
+      <CLabel col htmlFor="note">
+        {t('user.note')}
+      </CLabel>
+      <CCol sm="7">
+        <CInput
+          id="note"
+          type="text"
+          required
+          value={fields.note.value}
+          onChange={updateField}
+          invalid={fields.note.error}
+          disabled={disable}
+        />
+      </CCol>
+    </CFormGroup>
+  </CForm>
+);
+
+DuplicateEntityMapForm.propTypes = {
+  t: PropTypes.func.isRequired,
+  disable: PropTypes.bool.isRequired,
+  fields: PropTypes.instanceOf(Object).isRequired,
+  updateField: PropTypes.func.isRequired,
+};
+
+export default DuplicateEntityMapForm;
diff --git a/src/index.js b/src/index.js
index 1860fc2..f43501c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -44,6 +44,7 @@ export { default as DeviceFirmwareModal } from './components/DeviceFirmwareModal
 export { default as DeviceListTable } from './components/DeviceListTable';
 export { default as DeviceStatusCard } from './components/DeviceStatusCard';
 export { default as DeviceSearchBar } from './components/DeviceSearchBar';
+export { default as DuplicateEntityMapForm } from './components/DuplicateEntityMapForm';
 export { default as EditConfigurationForm } from './components/EditConfigurationForm';
 export { default as EditContactForm } from './components/EditContactForm';
 export { default as EditDefaultConfigurationForm } from './components/EditDefaultConfigurationForm';