Skip to content

commented total page code #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/DropZone.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const DropZone: FunctionComponent = () => {
type: `${file.name.substring(file.name.lastIndexOf('.') + 1, file.name.length).toUpperCase()}`,
size: file.size,
uploadprogess: file.size && file?.size < chunkSize ? 100 : 0,
total_pages: 0,
// total_pages: 0,
id: uuidv4(),
...defaultValues,
});
Expand Down Expand Up @@ -138,7 +138,7 @@ const DropZone: FunctionComponent = () => {
return {
...curfile,
uploadprogess: chunkNumber * chunkProgressIncrement,
total_pages: apiResponse.data.data.total_pages,
// total_pages: apiResponse.data.data.total_pages,
};
}
return curfile;
Expand Down
20 changes: 10 additions & 10 deletions frontend/src/components/FileTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { AxiosError } from 'axios';
import { XMarkIconOutline } from '@neo4j-ndl/react/icons';
import cancelAPI from '../services/CancelAPI';
import IconButtonWithToolTip from './IconButtonToolTip';
import { largeFileSize } from '../utils/Constants';

const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, setConnectionStatus, onInspect }) => {
const { filesData, setFilesData, model, rowSelection, setRowSelection, setSelectedRows } = useFileContext();
Expand Down Expand Up @@ -289,12 +290,12 @@ const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, set
header: () => <span>Relations</span>,
footer: (info) => info.column.id,
}),
columnHelper.accessor((row) => row.total_pages, {
id: 'Total pages',
cell: (info) => <i>{info.getValue()}</i>,
header: () => <span>Total pages</span>,
footer: (info) => info.column.id,
}),
// columnHelper.accessor((row) => row.total_pages, {
// id: 'Total pages',
// cell: (info) => <i>{info.getValue()}</i>,
// header: () => <span>Total pages</span>,
// footer: (info) => info.column.id,
// }),
columnHelper.accessor((row) => row.status, {
id: 'inspect',
cell: (info) => (
Expand Down Expand Up @@ -369,7 +370,7 @@ const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, set
!isNaN(Math.floor((item?.processed_chunk / item?.total_chunks) * 100))
? Math.floor((item?.processed_chunk / item?.total_chunks) * 100)
: undefined,
total_pages: item?.total_pages ?? 0,
// total_pages: item?.total_pages ?? 0,
access_token: item?.access_token ?? '',
});
}
Expand All @@ -382,10 +383,9 @@ const FileTable: React.FC<FileTableProps> = ({ isExpanded, connectionStatus, set
item.status === 'Processing' &&
item.fileName != undefined &&
userCredentials &&
userCredentials.database &&
item.total_pages
userCredentials.database
) {
if (item?.total_pages < 20) {
if (item?.fileSize > largeFileSize) {
subscribe(
item.fileName,
userCredentials?.uri,
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/GCSModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const GCSModal: React.FC<GCSModalProps> = ({ hideModal, open, openGCSModal }) =>
gcsBucket: item.gcsBucketName,
gcsBucketFolder: item.gcsBucketFolder,
google_project_id: item.gcsProjectId,
total_pages: 'N/A',
// total_pages: 'N/A',
id: uuidv4(),
access_token: codeResponse.access_token,
...defaultValues,
Expand All @@ -116,7 +116,7 @@ const GCSModal: React.FC<GCSModalProps> = ({ hideModal, open, openGCSModal }) =>
fileSource: defaultValues.fileSource,
processingProgress: defaultValues.processingProgress,
access_token: codeResponse.access_token,
total_pages: 'N/A',
// total_pages: 'N/A',
});
}
});
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/S3Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const S3Modal: React.FC<S3ModalProps> = ({ hideModal, open }) => {
name: item.fileName,
size: item.fileSize,
source_url: item.url,
total_pages: 'N/A',
// total_pages: 'N/A',
id: uuidv4(),
...defaultValues,
});
Expand All @@ -100,7 +100,7 @@ const S3Modal: React.FC<S3ModalProps> = ({ hideModal, open }) => {
model: defaultValues.model,
fileSource: defaultValues.fileSource,
processingProgress: defaultValues.processingProgress,
total_pages: 'N/A',
// total_pages: 'N/A',
});
}
});
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/WikipediaModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const WikipediaModal: React.FC<WikipediaModalTypes> = ({ hideModal, open }) => {
source_url: item.url,
id: uuidv4(),
language: item.language,
total_pages: 1,
// total_pages: 1,
...defaultValues,
});
} else {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/YoutubeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const YoutubeModal: React.FC<S3ModalProps> = ({ hideModal, open }) => {
name: item.fileName,
size: item.fileSize ?? 0,
source_url: item.url,
total_pages: 1,
// total_pages: 1,
id: uuidv4(),
...defaultValues,
});
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface CustomFileBase extends Partial<globalThis.File> {
}
export interface CustomFile extends CustomFileBase {
id: string;
total_pages: number | 'N/A';
// total_pages: number | 'N/A';
}

export interface OptionType {
Expand Down Expand Up @@ -123,7 +123,7 @@ export interface SourceNode {
language?: string;
processed_chunk?: number;
total_chunks?: number;
total_pages?: number;
// total_pages?: number;
access_token?: string;
}

Expand Down Expand Up @@ -258,7 +258,7 @@ export interface fileStatus {
relationshipCount?: number;
model: string;
total_chunks?: number;
total_pages?: number;
// total_pages?: number;
processed_chunk?: number;
}
export interface PollingAPI_Response extends Partial<AxiosResponse> {
Expand Down Expand Up @@ -345,7 +345,7 @@ export interface eventResponsetypes {
relationshipCount: number;
model: string;
total_chunks: number | null;
total_pages: number;
// total_pages: number;
fileSize: number;
processed_chunk?: number;
fileSource: string;
Expand Down Expand Up @@ -396,7 +396,7 @@ export type GroupedEntity = {

export interface uploadData {
file_size: number;
total_pages: number;
// total_pages: number;
file_name: string;
message: string;
}
Expand Down