Merge pull request #17 from Sanketika-Obsrv/v2_fixes

#OBS-l285: UI fixes
Sanketika-Obsrv · Oct 24, 2024 · 394316b · 394316b
2 parents 737755e + 82b5388
commit 394316b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/web-console-v2/src/components/ActionButtons/Actions.module.css b/web-console-v2/src/components/ActionButtons/Actions.module.css
@@ -7,7 +7,6 @@
   justify-content: flex-end;
   align-items: center;
   left: -1.23rem;
-  position: relative;
   transition:
     width 0.3s ease,
     transform 0.3s ease;

diff --git a/web-console-v2/src/components/ActionButtons/Actions.tsx b/web-console-v2/src/components/ActionButtons/Actions.tsx
@@ -27,6 +27,7 @@ const Actions = ({ buttons, onClick }: ActionsProps) => {
                         disabled={buttonConfig.disabled || false}
                         onClick={() => onClick(buttonConfig.id)}
                         className={styles.button}
+                        sx={{mr: 8}}
                     >
                         {buttonConfig.icon && <Button color="primary">{buttonConfig.icon}</Button>}
                         {buttonConfig.label}

diff --git a/web-console-v2/src/components/Dropzone/MultiFile.tsx b/web-console-v2/src/components/Dropzone/MultiFile.tsx
@@ -6,6 +6,7 @@ import uploadImage from 'assets/upload/upload.svg';
 import uploadIcon from 'assets/upload/upload_icon.svg';
 import PlaceholderContent from './PlaceholderContent';
 import { CustomFile, DropzopType, UploadMultiFileProps } from 'types/dropzone';
+import _ from 'lodash';
 
 const DropzoneWrapper = styled('div')(({ theme }) => ({
     outline: 'none',
@@ -58,7 +59,7 @@ const MultiFileUpload = ({
                 });
             });
             setFieldValue('files', data);
-            onUpload(data);
+            !_.isEmpty(data) && onUpload(data);
         }
     };
 

diff --git a/web-console-v2/src/components/EditDataset/AccordionSection.tsx b/web-console-v2/src/components/EditDataset/AccordionSection.tsx
@@ -109,6 +109,7 @@ const FieldSection = (props: any) => {
                 sx={{
                     '& .MuiAccordion-root': {
                         borderColor: theme.palette.divider,
+                        border: '1px solid #d6d6d6',
                         '& .MuiAccordionSummary-root': {
                             bgcolor: 'transparent',
                             boxShadow: 'none',

diff --git a/web-console-v2/src/components/ExpandingTable/ExpandingTable.tsx b/web-console-v2/src/components/ExpandingTable/ExpandingTable.tsx
@@ -108,7 +108,8 @@ const ReactTable = ({
                     <TableRow
                         {...row.getRowProps()}
                         sx={{
-                            // border: '2px solid black',
+                            outline: '1px solid #d6d6d6',
+                            borderRadius: '0.5rem',
                             backgroundColor: theme.palette.common.white,
                             ...(!disableRowColor && bgColor()),
                             marginLeft: isSubRow ? `${depth * 20}px` : '0'
@@ -151,7 +152,7 @@ const ReactTable = ({
 
     return (
         <TableContainer sx={tableSx}>
-            <Table sx={{ marginTop: showHeaders ? 0 : '1rem' }} {...getTableProps()}>
+            <Table sx={{ marginTop: showHeaders ? 0 : '1rem', width: '99.8%', marginRight: '0.063rem', marginLeft: '0.063rem' }} {...getTableProps()}>
                 {!showHeaders && (
                     <TableHead sx={tHeadHeight ? { height: tHeadHeight } : {}}>
                         {headerGroups.map((headerGroup) => (

diff --git a/web-console-v2/src/components/Stepper/Stepper.module.css b/web-console-v2/src/components/Stepper/Stepper.module.css
@@ -2,7 +2,7 @@
   display: flex;
   align-items: center;
   justify-content: flex-start;
-  padding-left: 3rem;
+  padding-left: 2rem;
   background-color: var(--white-color);
   height: 4rem;
   box-shadow: var(--shadow-large);

diff --git a/web-console-v2/src/pages/StepsPages/Ingestion/Ingestion.tsx b/web-console-v2/src/pages/StepsPages/Ingestion/Ingestion.tsx
@@ -29,6 +29,7 @@ import ingestionStyle from './Ingestion.module.css';
 import helpSectionData from './HelpSectionData.json';
 import axios from 'axios';
 import localStyles from "./Ingestion.module.css";
+import RejectionFiles from 'components/Dropzone/RejectionFiles';
 interface FormData {
     [key: string]: unknown;
 }
@@ -80,6 +81,9 @@ const Ingestion = () => {
 
     const ConnectorConfiguration = connectorConfigData ? JSON.parse(connectorConfigData) : null;
 
+    const [fileErrors, setFileErrors] = useState<any>(null);
+     const maxFileSizeConfig = 5242880;
+
     const {
         data: uploadData,
         isPending: isUploadLoading,
@@ -503,6 +507,8 @@ const Ingestion = () => {
                                                 files={files}
                                                 setFiles={setFiles}
                                                 allowSchema
+                                                maxFileSize={maxFileSizeConfig}
+                                                subscribeErrors={setFileErrors}
                                             />
                                             {!_.isEmpty(files) && (
                                                 <Box mx={3} mt={18}>
@@ -523,6 +529,9 @@ const Ingestion = () => {
                                                     />
                                                 </Box>
                                             )}
+                                            <Box sx={{marginTop: 30, mr: 1, ml: 1, mb:1}}>
+                                                 {fileErrors?.length > 0 && <RejectionFiles fileRejections={fileErrors} />}
+                                             </Box>
                                         </GenericCard>
                                     </Box>
                                 </Box>

diff --git a/web-console-v2/src/pages/StepsPages/Processing/Processing.tsx b/web-console-v2/src/pages/StepsPages/Processing/Processing.tsx
@@ -31,7 +31,9 @@ export const extractTransformationOptions = (schema: any, path: string[] = []):
         for (const key in schema.properties) {
             const currentPath = [...path, key].join('.');
 
-            options.push(currentPath);
+            if(!schema.properties[key].properties){
+                options.push(currentPath);
+            }
 
             if (schema.properties[key].properties) {
                 options.push(