Merge pull request #50 from Sanketika-Obsrv/main

Main to enterprise feature branch
Sanketika-Obsrv · Nov 4, 2024 · 4cbc154 · 4cbc154
2 parents 7f23dfa + 45db213
commit 4cbc154
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 36 deletions.
diff --git a/web-console-v2/src/components/CustomeTable/CustomTable.tsx b/web-console-v2/src/components/CustomeTable/CustomTable.tsx
@@ -12,7 +12,8 @@ const CustomTable = ({ columns, data, striped, header = true, styles = {} }: any
         <Table
             {...getTableProps()}
             sx={{
-                border: '1px solid #D6D6D6'
+                border: '1px solid #D6D6D6',
+                tableLayout:"fixed"
             }}
         >
             {header && (
@@ -25,12 +26,13 @@ const CustomTable = ({ columns, data, striped, header = true, styles = {} }: any
                                         border: '0.0625rem solid #D6D6D6',
                                         background: '#F9F9F9',
                                         ...styles,
-                                        textTransform: 'unset'
+                                        textTransform: 'unset',
+                                        overflowX:"scroll"
                                     }}
                                     {...column.getHeaderProps([{ className: column.className }])}
                                     key={i}
                                 >
-                                    <Typography variant="h5">{column.render('Header')}</Typography>
+                                    <Typography variant="h4">{column.render('Header')}</Typography>
                                 </TableCell>
                             ))}
                         </TableRow>

diff --git a/web-console-v2/src/components/EditDataset/EditDataset.tsx b/web-console-v2/src/components/EditDataset/EditDataset.tsx
@@ -75,7 +75,8 @@ export const inputFields = (
     );
 
     const arrivalTypeOptions = arrivalType.length <= 0 ? defaultDatatypeOptions : arrivalType;
-
+    const nameRegex = /^[^!@#$%^&()+{}[]:;<>,?~\|]$/;
+
     return [
         {
             title: 'EditLiveDatasetInputs',
@@ -111,6 +112,10 @@ export const inputFields = (
                                 )
                                 .test('spaceInField', en.containsSpaces, (value) =>
                                     hasSpacesInField(value)
+                                ).max(100, en.maxLen)
+                                .min(4, en.minLen)
+                                .test('validCharacters', "The field should exclude any special characters, permitting only '.', '-', '_', alphabets, numbers", (value) =>
+                                    nameRegex.test(value)
                                 )
                         }
                     ]

diff --git a/web-console-v2/src/components/HelpSection/HelpSection.module.css b/web-console-v2/src/components/HelpSection/HelpSection.module.css
@@ -19,6 +19,7 @@
 
 .collapsed {
   width: 3rem;
+  height: 100%;
 }
 
 .toggleButton {

diff --git a/web-console-v2/src/index.css b/web-console-v2/src/index.css
@@ -1,5 +1,3 @@
-
-
 :root {
   --drop-shadow-small: 4px 4px 44px 0px rgba(0, 0, 0, 0.1);
   --drop-shadow-medium: 4px 4px 16px 0px rgba(0, 0, 0, 0.1);
@@ -25,7 +23,7 @@
   --assessment-icon: #B8EAE6;
   --assessment-icon-2: #FAC280;
   --dashboard-card-box-shadow: 0.6rem 0.6rem 5.15rem 0rem rgba(0, 0, 0, 0.05);
-} 
+}
 
 :root {
   --white-color: #ffffff;
@@ -80,7 +78,7 @@ code {
   box-shadow: none;
 }
 
-div.HelpSection_expanded__vqSxk{
+div.HelpSection_expanded__vqSxk {
   z-index: 1301;
 }
 
@@ -92,4 +90,14 @@ div.HelpSection_expanded__vqSxk{
 .section.highlighted {
   color: orange;
   opacity: 1;
+}
+
+.MuiTableHead-root .MuiTableRow-root .MuiTableCell-head {
+  font-weight: bold;
+  resize: none;
+  overflow-x: scroll;
+}
+
+.MuiTableCell-root {
+  overflow-x: scroll;
 }
diff --git a/web-console-v2/src/pages/ConnectorConfiguration/ConnectorConfiguration.tsx b/web-console-v2/src/pages/ConnectorConfiguration/ConnectorConfiguration.tsx
@@ -287,14 +287,14 @@ const ConnectorConfiguration: React.FC = () => {
             <Box
                 className={`${isHelpSectionOpen ? styles.expanded : styles.collapsed}`}
                 mt={8}
-                sx={{
-                    position: 'fixed',
-                    bottom: 0,
-                    right: 0,
-                    left: -50,
-                    backgroundColor: theme.palette.background.paper,
-                    zIndex: 100
-                }}
+                    sx={{
+                        position: 'fixed',
+                        bottom: 0,
+                        right: 0,
+                        left: -50,
+                        backgroundColor: theme.palette.background.paper,
+                        zIndex: 100
+                    }}
                 pr={5}
             >
                 <Actions

diff --git a/web-console-v2/src/pages/StepsPages/Processing/Processing.tsx b/web-console-v2/src/pages/StepsPages/Processing/Processing.tsx
@@ -412,7 +412,7 @@ const Processing: React.FC = () => {
                     paddingTop: '1rem'
                 }}
             >
-                <Box mx={3.5} mb={2}>
+                <Box mx={3.5} my={2}>
                     <Button
                         variant="text"
                         sx={{ color: theme.palette.text.primary }}

diff --git a/web-console-v2/src/pages/StepsPages/Processing/ProcessingSection/ProcessingSection.tsx b/web-console-v2/src/pages/StepsPages/Processing/ProcessingSection/ProcessingSection.tsx
@@ -54,7 +54,7 @@ const ProcessingSection = (props: any) => {
             accessor: 'column',
             Cell: ({ value, cell }: any) => (
                 <Box minWidth="20vw" maxWidth="35vw">
-                    <Typography variant="h5">{value}</Typography>
+                    <Typography variant="h4">{value}</Typography>
                 </Box>
             )
         },
@@ -105,21 +105,9 @@ const ProcessingSection = (props: any) => {
                         aria-label="outlined button group"
                         sx={{ minWidth: '20vw', maxWidth: '30vw' }}
                     >
-                        {_.map(actions, (action: any) => (
-                            <Button
-                                size="large"
-                                key="one"
-                                sx={{ py: 1, px: 2 }}
-                                variant={
-                                    _.isEqual(transformationType, _.get(action, 'value', ''))
-                                        ? 'contained'
-                                        : 'outlined'
-                                }
-                                onClick={() => handleEditValues(_.get(cell, 'row.original'))}
-                            >
-                                {_.get(action, 'label', '')}
-                            </Button>
-                        ))}
+                        <Box>
+                            {transformationType === 'custom' ? 'JSONata' : transformationType}
+                        </Box>
                     </ButtonGroup>
                 );
             }

diff --git a/web-console-v2/src/theme.ts b/web-console-v2/src/theme.ts
@@ -207,6 +207,12 @@ export const theme = createTheme({
             fontSize: '1rem',
             color: '#111111'
         },
+        h4: {
+            fontFamily: 'Montserrat',
+            fontWeight: 600,
+            fontSize: '0.8rem',
+            color: '#111111'
+        },
         h5: {
             fontFamily: 'Montserrat',
             fontWeight: 600,

diff --git a/web-console-v2/src/utils/locales/en.json b/web-console-v2/src/utils/locales/en.json
@@ -301,8 +301,8 @@
     "yes": "Yes",
     "isRequired": "This field is required",
     "whiteSpaceConflict": "This field contains trailing/leading spaces.",
-    "minLen": "Minimum of {length} characters are required for this field",
-    "maxLen": "Maximum of {length} characters are required for this field",
+    "minLen": "Minimum of 4 characters are required for this field",
+    "maxLen": "Maximum of 100 characters are required for this field",
     "hasSpecialCharacters": "The field should exclude any special characters, permitting only alphabets, numbers, \".\", \"-\", and \"_\".",
     "maxTagsLimit": "User can add a maximum of {maxTagsLimit} tags.",
     "transformationNotSupported": "Please note that each field can have only one transformation applied to it.",
@@ -341,4 +341,4 @@
     "rollup-confirmation-context": "Queries might be inaccurate due to modifictions in dataset, are you sure you want to save?",
     "no-summary-modifications": "No changes detected in the configuration",
     "dataset-summary-review-warning": "Kindly be aware that querying the historical data may be affected by this modification."
-}
+}