cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-12 19:03:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

clean up sheet flow

Browse Source
This commit is contained in:
arc-alex
2023-11-24 17:47:21 +01:00
parent 111df94d6d
commit e8bcbb4291
6 changed files with 63 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/common/api/ontimeApi.ts
+4 -12
View File
@@ -251,21 +251,13 @@ export const getSheetsAuthUrl = async () => {
return res.data;
};
export const postPreviewSheet = async (sheetId: string, worksheet: string, options?: ExcelImportMap) => {
const response = await axios.post(`${ontimeURL}/sheet-preview`, {
sheetid: sheetId,
worksheet: worksheet,
options: options,
});
export const postPreviewSheet = async () => {
const response = await axios.post(`${ontimeURL}/sheet-preview`);
return response.data.data;
};
export const postPushSheet = async (sheetId: string, worksheet: string, options?: ExcelImportMap) => {
const response = await axios.post(`${ontimeURL}/sheet-push`, {
sheetid: sheetId,
worksheet: worksheet,
options: options,
});
export const postPushSheet = async () => {
const response = await axios.post(`${ontimeURL}/sheet-push`);
return response.data.data;
};
apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
+16 -14
View File
@@ -13,7 +13,7 @@ import {
import { IoCheckmarkCircleOutline } from '@react-icons/all-files/io5/IoCheckmarkCircleOutline';
import { IoCloseCircleOutline } from '@react-icons/all-files/io5/IoCloseCircleOutline';
import { useQueryClient } from '@tanstack/react-query';
import { GoogleSheetState,OntimeRundown, ProjectData, UserFields } from 'ontime-types';
import { GoogleSheetState, OntimeRundown, ProjectData, UserFields } from 'ontime-types';
import { PROJECT_DATA, RUNDOWN, USERFIELDS } from '../../../common/api/apiConstants';
import { maybeAxiosError } from '../../../common/api/apiUtils';
@@ -56,19 +56,19 @@ export default function SheetsModal(props: SheetsModalProps) {
setRundown(null);
setProject(null);
setUserFields(null);
// setSheetState({ auth: false, id: false, worksheet: false });
onClose();
};
const handleClick = () => {
fileInputRef.current?.click();
};
const handleFile = (event: ChangeEvent<HTMLInputElement>) => {
const handleFile = async (event: ChangeEvent<HTMLInputElement>) => {
const selectedFile = event?.target?.files?.[0];
if (!selectedFile) {
return;
} else {
uploadSheetClientFile(selectedFile);
await uploadSheetClientFile(selectedFile);
_onChange();
}
};
@@ -112,7 +112,7 @@ export default function SheetsModal(props: SheetsModalProps) {
};
const handlePullData = () => {
postPreviewSheet(sheetid.current?.value ?? '', worksheet.current?.value ?? '').then((data) => {
postPreviewSheet().then((data) => {
setProject(data.project);
setRundown(data.rundown);
setUserFields(data.userFields);
@@ -120,7 +120,7 @@ export default function SheetsModal(props: SheetsModalProps) {
};
const handlePushData = () => {
postPushSheet(sheetid.current?.value ?? '', worksheet.current?.value ?? '').then((data) => {
postPushSheet().then((data) => {
console.log(data);
});
};
@@ -218,18 +218,20 @@ export default function SheetsModal(props: SheetsModalProps) {
/>
{sheetState.worksheet ? <IoCheckmarkCircleOutline /> : <IoCloseCircleOutline />}
</div>
<div>
<Button variant='ontime-filled' padding='0 2em' onClick={handlePullData}>
Pull data
</Button>
<Button variant='ontime-filled' padding='0 2em' onClick={handlePushData}>
Push data
</Button>
</div>
</>
)}
</ModalBody>
<ModalFooter>
{!rundown && (
<div>
<Button variant='ontime-subtle-on-light' padding='0 2em' onClick={handlePullData}>
Pull data
</Button>
<Button variant='ontime-subtle-on-light' padding='0 2em' onClick={handlePushData}>
Push data
</Button>
</div>
)}
<Button variant='ontime-ghost-on-light'>Reset</Button>
{!rundown && (
<Button variant='ontime-filled' padding='0 2em' onClick={handelSave}>