types improvements

Author: kartikpersistent

frontend/src/components/Popups/GraphEnhancementDialog/EnitityExtraction/EntityExtractionSetting.tsx

@@ -5,7 +5,7 @@ import { Dropdown, Flex, Typography, useMediaQuery } from '@neo4j-ndl/react';
 import { useCredentials } from '../../../../context/UserCredentials';
 import { useFileContext } from '../../../../context/UsersFiles';
 import { OnChangeValue, ActionMeta } from 'react-select';
-import { OptionType, OptionTypeForExamples, schema, UserCredentials } from '../../../../types';
+import { OptionType, schema, UserCredentials } from '../../../../types';
 import { useAlertContext } from '../../../../context/Alert';
 import { getNodeLabelsAndRelTypes } from '../../../../services/GetNodeLabelsRelTypes';
 import schemaExamples from '../../../../assets/schemas.json';
@@ -154,8 +154,8 @@ export default function EntityExtractionSetting({
   const { showAlert } = useAlertContext();
 
   useEffect(() => {
-    const parsedData = schemaExamples.reduce((accu: OptionTypeForExamples[], example) => {
-      const examplevalues: OptionTypeForExamples = {
+    const parsedData = schemaExamples.reduce((accu: OptionType[], example) => {
+      const examplevalues: OptionType = {
         label: example.schema,
         value: JSON.stringify({
           nodelabels: example.labels,

frontend/src/components/Popups/GraphEnhancementDialog/index.tsx

@@ -6,8 +6,6 @@ import deleteOrphanAPI from '../../../services/DeleteOrphanNodes';
 import { UserCredentials } from '../../../types';
 import { useCredentials } from '../../../context/UserCredentials';
 import EntityExtractionSettings from './EnitityExtraction/EntityExtractionSetting';
-import { AlertColor, AlertPropsColorOverrides } from '@mui/material';
-import { OverridableStringUnion } from '@mui/types';
 import { useFileContext } from '../../../context/UsersFiles';
 import DeduplicationTab from './Deduplication';
 import { tokens } from '@neo4j-ndl/base';

frontend/src/components/Popups/Settings/SettingModal.tsx

@@ -1,6 +1,6 @@
 import { Dialog, Dropdown } from '@neo4j-ndl/react';
 import { OnChangeValue, ActionMeta } from 'react-select';
-import { OptionType, OptionTypeForExamples, SettingsModalProps, UserCredentials, schema } from '../../../types';
+import { OptionType, SettingsModalProps, UserCredentials, schema } from '../../../types';
 import { useFileContext } from '../../../context/UsersFiles';
 import { getNodeLabelsAndRelTypes } from '../../../services/GetNodeLabelsRelTypes';
 import { useCredentials } from '../../../context/UserCredentials';
@@ -129,8 +129,8 @@ const SettingsModal: React.FC<SettingsModalProps> = ({
   const { showAlert } = useAlertContext();
 
   useEffect(() => {
-    const parsedData = schemaExamples.reduce((accu: OptionTypeForExamples[], example) => {
-      const examplevalues: OptionTypeForExamples = {
+    const parsedData = schemaExamples.reduce((accu: OptionType[], example) => {
+      const examplevalues: OptionType = {
         label: example.schema,
         value: JSON.stringify({
           nodelabels: example.labels,

frontend/src/hooks/useSourceInput.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { CustomFile, CustomFileBase, ScanProps, UserCredentials, fileName } from '../types';
+import { CustomFile, CustomFileBase, ScanProps, UserCredentials } from '../types';
 import { useFileContext } from '../context/UsersFiles';
 import { useCredentials } from '../context/UserCredentials';
 import { urlScanAPI } from '../services/URLScan';

frontend/src/services/CommonAPI.ts

@@ -6,15 +6,17 @@ const apiCall = async (
   url: string,
   method: Method,
   commonParams: UserCredentials,
-  additionalParams: FormDataParams
+  additionalParams: Partial<FormDataParams>
 ) => {
   try {
     const formData = new FormData();
     for (const key in commonParams) {
       formData.append(key, commonParams[key]);
     }
     for (const key in additionalParams) {
+      if (additionalParams.hasOwnProperty(key)) {
       formData.append(key, additionalParams[key]);
+      }
     }
     const response: AxiosResponse = await axios({
       method: method,

frontend/src/types.ts

@@ -30,18 +30,13 @@ export interface CustomFileBase extends Partial<globalThis.File> {
 }
 export interface CustomFile extends CustomFileBase {
   id: string;
-  // total_pages: number | 'N/A';
 }
 
 export interface OptionType {
   readonly value: string;
   readonly label: string;
 }
 
-export interface OptionTypeForExamples {
-  readonly value: string;
-  readonly label: string;
-}
 
 export type UserCredentials = {
   uri: string;
@@ -50,14 +45,27 @@ export type UserCredentials = {
   database: string;
 } & { [key: string]: any };
 
-export type ExtractParams = {
+export interface SourceNode extends Omit<CustomFileBase,'relationshipCount'> {
+  fileName: string;
+  fileSize: number;
+  fileType: string;
+  nodeCount?: number;
+  processingTime?: string;
+  relationshipCount?: number;
+  url?: string;
+  awsAccessKeyId?: string;
+  uploadprogress?: number;
+  gcsProjectId?: string;
+  processed_chunk?: number;
+  total_chunks?: number;
+  retry_condition?: string;
+}
+
+export type ExtractParams = Pick<CustomFile,'wiki_query'|'model'|'source_url'|'language'|'access_token'>&{
   file?: File;
-  model: string;
-  source_url?: string;
   aws_access_key_id?: string | null;
   aws_secret_access_key?: string | null;
   max_sources?: number;
-  wiki_query?: string;
   gcs_bucket_name?: string;
   gcs_bucket_folder?: string;
   gcs_blob_filename?: string;
@@ -66,10 +74,8 @@ export type ExtractParams = {
   allowedNodes?: string[];
   allowedRelationship?: string[];
   gcs_project_id?: string;
-  language?: string;
-  access_token?: string;
   retry_condition: string;
-} & { [key: string]: any };
+} & { [key: string]: any }
 
 export type UploadParams = {
   file: Blob;
@@ -100,36 +106,11 @@ export interface S3ModalProps {
   hideModal: () => void;
   open: boolean;
 }
-export interface GCSModalProps {
-  hideModal: () => void;
-  open: boolean;
+export interface GCSModalProps extends Omit<S3ModalProps,''>{
   openGCSModal: () => void;
 }
 
-export interface SourceNode {
-  fileName: string;
-  fileSize: number;
-  fileType: string;
-  nodeCount?: number;
-  processingTime?: string;
-  relationshipCount?: number;
-  model: string;
-  status: string;
-  url?: string;
-  awsAccessKeyId?: string;
-  fileSource: string;
-  gcsBucket?: string;
-  gcsBucketFolder?: string;
-  errorMessage?: string;
-  uploadprogress?: number;
-  gcsProjectId?: string;
-  language?: string;
-  processed_chunk?: number;
-  total_chunks?: number;
-  // total_pages?: number;
-  access_token?: string;
-  retry_condition?: string;
-}
+
 
 export interface SideNavProps {
   isExpanded: boolean;
@@ -254,9 +235,7 @@ export type ChatbotProps = {
   clear?: boolean;
   isFullScreen?: boolean;
 };
-export interface WikipediaModalTypes {
-  hideModal: () => void;
-  open: boolean;
+export interface WikipediaModalTypes extends Omit<S3ModalProps,''> {
 }
 
 export interface GraphViewModalProps {
@@ -346,10 +325,8 @@ export type alertStateType = {
   alertType: OverridableStringUnion<AlertColor, AlertPropsColorOverrides> | undefined;
   alertMessage: string;
 };
-export interface BannerAlertProps {
-  showAlert: boolean;
+export interface BannerAlertProps extends Omit<alertStateType,'alertType'>{
   alertType: BannerType;
-  alertMessage: string;
 }
 export type Scheme = Record<string, string>;
 
@@ -446,19 +423,11 @@ export interface chatInfoMessage extends Partial<Messages> {
   error: string;
 }
 
-export interface eventResponsetypes {
-  fileName: string;
-  status: string;
-  processingTime: number;
-  nodeCount: number;
-  relationshipCount: number;
-  model: string;
+export interface eventResponsetypes extends Omit<SourceNode,'total_chunks'|'processingTime'> {
   total_chunks: number | null;
-  // total_pages: number;
-  fileSize: number;
-  processed_chunk?: number;
-  fileSource: string;
+  processingTime:number
 }
+
 export type Nullable<Type> = Type | null;
 
 export type LabelColors = 'default' | 'success' | 'info' | 'warning' | 'danger' | undefined;
@@ -680,4 +649,4 @@ export interface ContextProps {
 export interface MessageContextType {
   messages: Messages[] | [];
   setMessages: Dispatch<SetStateAction<Messages[]>>;
-}
+}