Merge pull request #1593 from memphisdev/bugfix-RND-401-function-the-…

…loading-indication-when-pressing-install-function-looks-empty Function - The loading indication when pressing install function icon empty
superstreamlabs · Jan 2, 2024 · 4882706 · 4882706
2 parents ce226ed + 41a1c1e
commit 4882706
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 9 deletions.
diff --git a/ui_src/src/components/connectorError/index.js b/ui_src/src/components/connectorError/index.js
@@ -72,7 +72,7 @@ const ConnectorError = ({ open, clickOutside, connectorId }) => {
 
     return (
         <Modal
-            header={'Connector Logs'}
+            header={'Connector Errors'}
             className={'modal-wrapper produce-modal'}
             width="550px"
             height="50vh"

diff --git a/ui_src/src/components/customSelect/index.js b/ui_src/src/components/customSelect/index.js
@@ -15,7 +15,7 @@ import './style.scss';
 import { ArrowDropDownRounded } from '@material-ui/icons';
 import { useHistory } from 'react-router-dom';
 import { BsPlus } from 'react-icons/bs';
-import { Select } from 'antd';
+import { Divider, Select, Space } from 'antd';
 import React from 'react';
 
 import SchemaIconSelect from 'assets/images/schemaIconSelect.svg';
@@ -86,6 +86,42 @@ const CustomSelect = ({ options, onChange, value, placeholder, type = 'schema',
                         )}
                     </div>
                 }
+                dropdownRender={(menu) => (
+                    <>
+                        {menu}
+                        {type === 'user' && options.length > 0 && (
+                            <>
+                                <Divider
+                                    style={{
+                                        margin: '8px 0',
+                                    }}
+                                />
+                                <Space
+                                    style={{
+                                        padding: '0 20px 4px',
+                                    }}
+                                >
+                                    <Button
+                                        placeholder={
+                                            <div className="create-btn">
+                                                <BsPlus style={{color: '#6557FF', fontSize: '18px'}}/>
+                                                <p>Create a user</p>
+                                            </div>
+                                        }
+                                        width="83px"
+                                        height="32px"
+                                        colorType="purple"
+                                        radiusType="circle"
+                                        backgroundColorType={'none'}
+                                        fontSize="12px"
+                                        fontWeight="600"
+                                        onClick={() => handleCreateNew()}
+                                    />
+                                </Space>
+                            </>
+                        )}
+                    </>
+                )}
             >
                 {type === 'dls' && options.length > 0 && (
                     <Option value={null}>

diff --git a/ui_src/src/components/customSelect/style.scss b/ui_src/src/components/customSelect/style.scss
@@ -43,7 +43,7 @@
     }
     .schema-name {
         font-family: 'InterMedium';
-        font-size: 16px;
+        font-size: 14px;
         margin: 0;
         margin-left: 10px;
     }
@@ -113,7 +113,7 @@
         .title {
             color: #1d1d1d;
             font-family: 'InterMedium';
-            font-size: 16px;
+            font-size: 14px;
             line-height: 16px;
         }
         .sub-title {

diff --git a/ui_src/src/components/sdkExample/index.js b/ui_src/src/components/sdkExample/index.js
@@ -95,9 +95,7 @@ const SdkExample = ({ consumer, showTabs = true, stationName, username, connecti
     };
 
     useEffect(() => {
-        if (!consumer) {
-            getAllUsers();
-        }
+        getAllUsers();
     }, []);
 
     useEffect(() => {
@@ -151,9 +149,10 @@ const SdkExample = ({ consumer, showTabs = true, stationName, username, connecti
         setFormFields({ ...formFields, headersList });
     };
 
-    const handleAddUser = (userData) => {
+    const handleAddUser = async (userData) => {
         setCreateUserLoader(false);
         addUserModalFlip(false);
+        await getAllUsers();
         updateFormFields('userName', userData.username);
     };
 
@@ -562,7 +561,7 @@ const SdkExample = ({ consumer, showTabs = true, stationName, username, connecti
                                                         placeholder={'Select user'}
                                                         value={formFields.userName}
                                                         options={users}
-                                                        onChange={(e) => updateFormFields('userName', e)}
+                                                        onChange={(e) => {updateFormFields('userName', e)}}
                                                         type="user"
                                                         handleCreateNew={() => addUserModalFlip(true)}
                                                         showCreatedBy={false}

diff --git a/ui_src/src/domain/functions/components/functionList/style.scss b/ui_src/src/domain/functions/components/functionList/style.scss
@@ -6,6 +6,11 @@
     padding: 1vw;
     min-width: 700px;
     height: 100%;
+
+    .button-container.uninstall-btn button {
+        opacity: 1!important;
+    }
+
     .ant-btn > .ant-btn-loading-icon .anticon {
         padding-right: 0px !important;
         color: var(--purple);