Merge pull request #971 from KelvinTegelaar/dev

Dev to release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "1.5.1",
+  "version": "2.6.1",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -54,8 +54,6 @@
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-app-polyfill": "^2.0.0",
-    "react-bootstrap-table2-paginator": "^2.1.2",
-    "react-bootstrap-table2-toolkit": "^2.1.3",
     "react-copy-to-clipboard": "^5.0.4",
     "react-data-table-component": "^7.4.5",
     "react-dom": "^17.0.2",

public/version_latest.txt

@@ -1 +1 @@
-2.6.1
+2.7.0

src/_nav.js

@@ -269,6 +269,11 @@ const _nav = [
         name: 'Add Office App',
         to: '/endpoint/applications/add-office-app',
       },
+      {
+        component: CNavItem,
+        name: 'Add MSP App',
+        to: '/endpoint/applications/add-rmm-app',
+      },
     ],
   },
   {

src/components/forms/RFFComponents.js

@@ -293,18 +293,35 @@ export const RFFSelectSearch = ({
         return (
           <div>
             <CFormLabel htmlFor={name}>{label}</CFormLabel>
-            <Select
-              className="react-select-container"
-              classNamePrefix="react-select"
-              {...input}
-              isClearable={true}
-              name={name}
-              id={name}
-              disabled={disabled}
-              options={selectSearchvalues}
-              placeholder={placeholder}
-              isMulti={multi}
-            />
+            {onChange && (
+              <Select
+                className="react-select-container"
+                classNamePrefix="react-select"
+                {...input}
+                isClearable={true}
+                name={name}
+                id={name}
+                disabled={disabled}
+                options={selectSearchvalues}
+                placeholder={placeholder}
+                isMulti={multi}
+                onChange={onChange}
+              />
+            )}
+            {!onChange && (
+              <Select
+                className="react-select-container"
+                classNamePrefix="react-select"
+                {...input}
+                isClearable={true}
+                name={name}
+                id={name}
+                disabled={disabled}
+                options={selectSearchvalues}
+                placeholder={placeholder}
+                isMulti={multi}
+              />
+            )}
             <RFFCFormFeedback meta={meta} />
           </div>
         )

src/components/utilities/UsageLocation.js

@@ -3,31 +3,32 @@ import { CCard, CCardHeader } from '@coreui/react'
 import { useDispatch, useSelector } from 'react-redux'
 import { setDefaultusageLocation } from 'src/store/features/app'
 import countryList from 'src/data/countryList'
-import SelectSearch, { fuzzySearch } from 'react-select-search'
+import Select from 'react-select'
 
 const UsageLocation = () => {
   const dispatch = useDispatch()
   const usagelocation = useSelector((state) => state.app.usageLocation)
-  const Switchusage = (t) => {
+  const Switchusage = (t, n) => {
     // console.log(t)
     dispatch(setDefaultusageLocation({ usageLocation: t }))
   }
 
   return (
     <CCard>
       <CCardHeader>Select default usage location</CCardHeader>
-      <SelectSearch
+      <Select
+        className="react-select-container"
+        classNamePrefix="react-select"
         options={countryList.map(({ Code, Name }) => ({
           value: Code,
-          name: Name,
+          label: Name,
         }))}
+        isClearable={true}
         name="usageLocation"
         value={usagelocation}
         placeholder="Type to search..."
         label="Usage Location"
         onChange={(value) => Switchusage(value)}
-        search
-        filterOptions={fuzzySearch}
       />
     </CCard>
   )