authscape 1.0.338 → 1.0.342

package/index.js

@@ -2257,7 +2257,7 @@ function OEMEditor(_ref) {
   var monaco = (0, _react2.useMonaco)();
   var cssEditorRef = (0, _react.useRef)(null);
   var htmlEditorRef = (0, _react.useRef)(null);
-  var _useState = (0, _react.useState)(''),
+  var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
@@ -2333,10 +2333,9 @@ function OEMEditor(_ref) {
     };
   }();
   (0, _react.useEffect)(function () {
-    // if (oEMDomain != null)
-    // {
-    loadDNSFields(oEMDomain);
-    // }
+    if (oEMDomain != null) {
+      loadDNSFields(oEMDomain);
+    }
   }, [oEMDomain]);
   (0, _react.useEffect)(function () {
     if (loadedUser) {
@@ -2353,26 +2352,26 @@ function OEMEditor(_ref) {
                 if (response != null && response.status == 200) {
                   setFonts(response.data);
                 }
-                _context2.next = 6;
-                return loadDNSFields();
-              case 6:
                 if (!showAllDomains) {
-                  _context2.next = 13;
+                  _context2.next = 11;
                   break;
                 }
-                _context2.next = 9;
+                _context2.next = 7;
                 return apiService().get("/WhiteLabel/GetAllDomains");
-              case 9:
+              case 7:
                 _response = _context2.sent;
                 if (_response != null && _response.status == 200) {
                   setOEMDomainList(_response.data);
+                  if (_response.data.length > 0) {
+                    setOEMDomain(_response.data[0].name);
+                  }
                 }
-                _context2.next = 17;
-                break;
-              case 13:
                 _context2.next = 15;
+                break;
+              case 11:
+                _context2.next = 13;
                 return apiService().get("/WhiteLabel/GetAllDomainsUser");
-              case 15:
+              case 13:
                 _response2 = _context2.sent;
                 if (_response2 != null && _response2.status == 200) {
                   setOEMDomainList(_response2.data);
@@ -2380,7 +2379,7 @@ function OEMEditor(_ref) {
                     setOEMDomain(_response2.data[0].name);
                   }
                 }
-              case 17:
+              case 15:
               case "end":
                 return _context2.stop();
             }
@@ -2469,11 +2468,11 @@ function OEMEditor(_ref) {
   }, selectedFont != null && fontUri == null && /*#__PURE__*/_react["default"].createElement("link", {
     href: "https://fonts.googleapis.com/css2?family=" + selectedFont,
     rel: "stylesheet"
-  }), oEMDomain != null && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+  }), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
       paddingTop: 6
     }
-  }, /*#__PURE__*/_react["default"].createElement(_FormControl["default"], {
+  }, oEMDomain != null && /*#__PURE__*/_react["default"].createElement(_FormControl["default"], {
     fullWidth: true
   }, /*#__PURE__*/_react["default"].createElement(_InputLabel["default"], {
     id: "demo-simple-select-label"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.338",
+  "version": "1.0.342",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/OEMEditor.js

@@ -25,7 +25,7 @@ export function OEMEditor({loadedUser, notification, showAllDomains = false, com
     const cssEditorRef = useRef(null);
     const htmlEditorRef = useRef(null);
 
-    const [data, setData] = useState('');
+    const [data, setData] = useState(null);
     const [value, setValue] = useState(0);
     const [fonts, setFonts] = useState([]);
     const [oEMDomainList, setOEMDomainList] = useState([]);
@@ -66,10 +66,10 @@ export function OEMEditor({loadedUser, notification, showAllDomains = false, com
 
     useEffect(() => {
 
-        // if (oEMDomain != null)
-        // {
+        if (oEMDomain != null)
+        {
             loadDNSFields(oEMDomain);
-        // }
+        }
 
     }, [oEMDomain]);
 
@@ -86,14 +86,17 @@ export function OEMEditor({loadedUser, notification, showAllDomains = false, com
             setFonts(response.data);
           }
 
-          await loadDNSFields();
-
           if (showAllDomains)
           {
             let response = await apiService().get("/WhiteLabel/GetAllDomains");
             if (response != null && response.status == 200)
             {
                 setOEMDomainList(response.data);
+
+                if (response.data.length > 0)
+                {
+                    setOEMDomain(response.data[0].name);
+                }
             }
           }
           else
@@ -183,8 +186,8 @@ export function OEMEditor({loadedUser, notification, showAllDomains = false, com
             <link href={"https://fonts.googleapis.com/css2?family=" + selectedFont} rel="stylesheet"></link>
             }
 
-            {oEMDomain != null &&
             <Box sx={{paddingTop:6}}>
+              {oEMDomain != null &&
                 <FormControl fullWidth>
                     <InputLabel id="demo-simple-select-label">Website Domain</InputLabel>
                     <Select
@@ -202,8 +205,8 @@ export function OEMEditor({loadedUser, notification, showAllDomains = false, com
                             })}
                     </Select>
                 </FormControl>
+              }
             </Box>
-            }
         
             <Box sx={{ borderBottom: 1, borderColor: 'divider', paddingTop:2 }}>
                 <Tabs value={value} onChange={handleChange} aria-label="basic tabs example">
@@ -239,33 +242,29 @@ export function OEMEditor({loadedUser, notification, showAllDomains = false, com
                         </Box>
 
                         {dnsFields != null && dnsFields.map((dnsField, index) => {
-                        
-                        return (
-                            <Box key={index}>
-                                <Grid container spacing={2}>
-                                    <Grid item xs={3}>
-                                        {dnsField.name}
-                                    </Grid>
-                                    <Grid item xs={9}>
-
-                                    <ColorPicker name={dnsField.name} defaultColor={dnsField.value} onColorChanged={async (name, hex) => {
-
-                                        await apiService().post("/WhiteLabel/SetFieldValue", {
-                                        id: dnsField.id,
-                                        fieldId: dnsField.fieldId,
-                                        value: hex
-                                        });
+                            return (
+                                <Box key={index}>
+                                    <Grid container spacing={2}>
+                                        <Grid item xs={3}>
+                                            {dnsField.name}
+                                        </Grid>
+                                        <Grid item xs={9}>
+
+                                        <ColorPicker name={dnsField.name} defaultColor={dnsField.value} onColorChanged={async (name, hex) => {
+
+                                            await apiService().post("/WhiteLabel/SetFieldValue", {
+                                            id: dnsField.id,
+                                            fieldId: dnsField.fieldId,
+                                            value: hex
+                                            });
 
-                                        notification(dnsField.name + " Saved");
+                                            notification(dnsField.name + " Saved");
 
-                                    }} />
+                                        }} />
+                                        </Grid>
                                     </Grid>
-                                </Grid>
-                            </Box>
-                        )
-
-                        
-
+                                </Box>
+                            )
                         })}
                     </Box>
                     }