Merge pull request #11 from Sanketika-Obsrv/merging-console

#OBS-I280 : added v2 console to open-source

.gitignore

@@ -44,6 +44,7 @@ lerna-debug.log*
 
 # production
 /build
+/buildV2
 /dist
 
 # Logs

Dockerfile

@@ -6,6 +6,14 @@ RUN npm install --legacy-peer-deps
 COPY ./client/ .
 RUN npm run build
 
+# Stage 2 - Build the React client v2
+FROM --platform=linux/amd64 node:20.10-alpine AS clientv2-build
+WORKDIR /opt/app/web-console-v2
+COPY ./web-console-v2/package.json .
+RUN npm install --legacy-peer-deps
+COPY ./web-console-v2/ .
+RUN npm run build
+
 # Stage 2 - Run the Node.js server
 FROM --platform=linux/amd64 node:20.10-alpine AS server-build
 WORKDIR /opt/app/server
@@ -14,5 +22,7 @@ RUN npm install
 COPY . .
 COPY LICENSE /opt/app/LICENSE
 COPY --from=client-build /opt/app/client/build ./src/build
+COPY --from=clientv2-build /opt/app/web-console-v2/build ./src/buildV2
 RUN rm -rf /opt/app/server/client
+RUN rm -rf /opt/app/server/web-console-v2
 CMD ["npm", "run", "start"]

client/package.json

@@ -3,6 +3,7 @@
     "version": "1.2.0",
     "private": true,
     "homepage": "/console",
+    "proxy": "http://localhost:3000/",
     "dependencies": {
         "@ant-design/colors": "^6.0.0",
         "@ant-design/icons": "^4.7.0",
@@ -125,4 +126,4 @@
         "semver": "^7.5.3",
         "lodash": "^4.17.21"
     }
-}
+}

client/src/components/MainCard.tsx

@@ -55,7 +55,7 @@ const MainCard = forwardRef(
             tagLine,
             modal = false,
             ...others
-        }: MainCardProps,
+        }: any,
         ref: Ref<HTMLDivElement>
     ) => {
         const theme = useTheme();

client/src/components/third-party/dropzone/Avatar.tsx

@@ -122,7 +122,7 @@ const AvatarUpload = ({ error, file, setFieldValue, sx, ...other }: UploadProps)
           </PlaceholderWrapper>
         </DropzoneWrapper>
       </RootWrapper>
-      {fileRejections.length > 0 && <RejectionFiles fileRejections={fileRejections} />}
+      {fileRejections.length > 0 && <RejectionFiles fileRejections={[...fileRejections]} />}
     </>
   );
 };

client/src/menu-items/datasets.tsx

@@ -24,7 +24,7 @@ const other: NavItemType = {
             id: 'new',
             title: <FormattedMessage id="new-dataset" />,
             type: 'item',
-            url: '/dataset/new',
+            url: '/home/new-dataset',
             icon: icons.PlusCircleOutlined
         },
         {
@@ -37,4 +37,4 @@ const other: NavItemType = {
     ]
 };
 
-export default other;
+export default other;

client/src/pages/alertManager/services/utils.tsx

@@ -138,7 +138,7 @@ export const renderStatusChip = (payload: Record<string, any>) => {
 export const getSilenceComponent = (props: any) => {
     return () => {
         const { silenceData, setAlertStatus, fetchDataHandler, toggleFilter, removeFilter } = props;
-        return _.map(silenceData, (value, state) => (
+        return _.map(silenceData, (value: any, state: any) => (
             <Chip
                 key={state}
                 size="small"
@@ -162,7 +162,7 @@ export const getSilenceComponent = (props: any) => {
 export const getStatusComponent = (props: any) => {
     return () => {
         const { statusData, setSilenceStatus, fetchDataHandler, toggleFilter, removeFilter } = props;
-        return _.map(statusData, (value, status) => (
+        return _.map(statusData, (value:any, status:any) => (
             <Chip
                 key={status}
                 size="small"

client/src/pages/dashboard/ReadyToPublishDatasets.tsx

@@ -347,7 +347,13 @@ const ReadyToPublishDatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
                                 data-objecttype={row?.type === DatasetType.MasterDataset ? 'masterDataset' : 'dataset'}
                                 color="primary"
                                 size="large"
-                                onClick={_ => navigateToPath(`/datasets/edit/${row.dataset_id}?master=${row.type === DatasetType.MasterDataset}&status=${row.status}`)}>
+                                onClick={() => {
+                                    const datasetId = row?.dataset_id;
+                                    const master = row?.type === DatasetType.MasterDataset;
+                                    const status = row?.status;
+                                    const url = `/home/ingestion/schema-details/${datasetId}`;
+                                    window.location.href = url;
+                                }}>
                                 <EditOutlined />
                             </IconButton>
                         </Tooltip>
@@ -426,4 +432,4 @@ const ReadyToPublishDatasetsList = ({ setDatasetType, sourceConfigs }: any) => {
     );
 };
 
-export default ReadyToPublishDatasetsList;
+export default ReadyToPublishDatasetsList;

client/src/pages/dashboard/draftDatasetsList.tsx

@@ -282,7 +282,13 @@ const DraftDatasetsList = (props: any) => {
                                 data-objecttype={row?.type === DatasetType.MasterDataset ? DatasetType.MasterDataset : DatasetType.Dataset}
                                 color="primary"
                                 size="large"
-                                onClick={_ => navigateToPath(`/datasets/edit/${row.dataset_id}?master=${row.type === DatasetType.MasterDataset}&status=${row.status}`)}>
+                                onClick={() => {
+                                    const datasetId = row?.dataset_id;
+                                    const master = row?.type === DatasetType.MasterDataset;
+                                    const status = row?.status;
+                                    const url = `/home/ingestion/schema-details/${datasetId}`;
+                                    window.location.href = url;
+                                }}>
                                 <EditOutlined />
                             </IconButton>
                         </Tooltip>
@@ -336,4 +342,4 @@ const DraftDatasetsList = (props: any) => {
     );
 };
 
-export default DraftDatasetsList;
+export default DraftDatasetsList;

client/src/pages/dataset/wizard/index.tsx

@@ -152,6 +152,10 @@ const DatasetOnboarding = ({ edit = false, master = false, key = Math.random(),
         </Stepper>
     );
 
+    useEffect(() => {
+        window.location.href = "/home/new-dataset"
+    }, [])
+
     return (
         <>
             <Box>
@@ -181,4 +185,4 @@ const DatasetOnboarding = ({ edit = false, master = false, key = Math.random(),
     );
 };
 
-export default DatasetOnboarding;
+export default DatasetOnboarding;