Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
getItemFile,
getItemCombinationDataFile,
getQuestFile,
getZoneDataFile,
getMaps,
type ItemFileNameEncoding,
} from '@/lib/api';
Expand All @@ -36,6 +37,7 @@ import { DropFileEdit } from './drop-file-edit';
import { ItemFileEdit } from './item-file-edit';
import { ItemCombinationDataFileEdit } from './item-combination-data-file-edit';
import { QuestFileEdit } from './quest-file-edit';
import { ZoneDataFileEdit } from './zone-data-file-edit';
import { queryKeys } from '@/constants';

interface FileEditProps {
Expand Down Expand Up @@ -121,6 +123,16 @@ export function FileEdit({ filePath }: FileEditProps) {
enabled: !!filePath && fileType === 'a3_quest_file' && canEditFiles,
});

const {
data: zoneDataFileData,
isLoading: zoneDataFileLoading,
error: zoneDataFileError,
} = useQuery({
queryKey: queryKeys.zoneDataFile(filePath),
queryFn: () => getZoneDataFile({ path: filePath }),
enabled: !!filePath && fileType === 'a3_zone_data_file' && canEditFiles,
});

const {
data: dropFileData,
isLoading: dropFileLoading,
Expand Down Expand Up @@ -230,6 +242,7 @@ export function FileEdit({ filePath }: FileEditProps) {
itemFileError,
itemCombinationDataFileError,
questFileError,
zoneDataFileError,
]);

return (
Expand Down Expand Up @@ -278,7 +291,8 @@ export function FileEdit({ filePath }: FileEditProps) {
dropFileError ||
itemFileError ||
itemCombinationDataFileError ||
questFileError) && (
questFileError ||
zoneDataFileError) && (
<Alert variant="destructive" className="mb-6">
<AlertDescription>{fileContentErrorMessage}</AlertDescription>
</Alert>
Expand Down Expand Up @@ -458,14 +472,31 @@ export function FileEdit({ filePath }: FileEditProps) {
)}
</>
)}
{fileType === 'a3_zone_data_file' && (
<>
{zoneDataFileLoading && (
<div className="flex h-96 items-center justify-center">
<Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
</div>
)}
{zoneDataFileData && !zoneDataFileError && (
<ZoneDataFileEdit
key={filePath}
filePath={filePath}
defaultData={zoneDataFileData}
/>
)}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
</>
)}
{fileType &&
fileType !== 'text_file' &&
fileType !== 'a3_npc_file' &&
fileType !== 'a3_spawn_file' &&
fileType !== 'a3_drop_file' &&
!isItemFileType(fileType) &&
fileType !== 'a3_item_combination_data_file' &&
fileType !== 'a3_quest_file' && (
fileType !== 'a3_quest_file' &&
fileType !== 'a3_zone_data_file' && (
<Card>
<CardContent className="p-6 text-center text-muted-foreground">
File type "{fileType}" is not yet supported for editing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
getItemFile,
getItemCombinationDataFile,
getQuestFile,
getZoneDataFile,
getRevisionSummary,
createFileDownloadLink,
revertFile,
Expand All @@ -53,6 +54,7 @@ import { DropFileView } from '@/components/drop-file-view';
import { ItemFileView } from '@/components/item-file-view';
import { ItemCombinationDataFileView } from '@/components/item-combination-data-file-view';
import { QuestFileView } from '@/components/quest-file-view';
import { ZoneDataFileView } from '@/components/zone-data-file-view';
import { toast } from 'sonner';
import { queryKeys } from '@/constants';

Expand Down Expand Up @@ -141,6 +143,16 @@ export function FileView({ filePath }: FileViewProps) {
enabled: !!filePath && fileType === 'a3_quest_file',
});

const {
data: zoneDataFileData,
isLoading: zoneDataFileLoading,
error: zoneDataFileError,
} = useQuery({
queryKey: queryKeys.zoneDataFile(filePath),
queryFn: () => getZoneDataFile({ path: filePath }),
enabled: !!filePath && fileType === 'a3_zone_data_file',
});

const {
data: dropFileData,
isLoading: dropFileLoading,
Expand Down Expand Up @@ -244,6 +256,9 @@ export function FileView({ filePath }: FileViewProps) {
queryClient.invalidateQueries({
queryKey: queryKeys.questFile(filePath),
});
queryClient.invalidateQueries({
queryKey: queryKeys.zoneDataFile(filePath),
});
queryClient.invalidateQueries({
queryKey: queryKeys.fileTree(filePath),
});
Expand Down Expand Up @@ -319,6 +334,7 @@ export function FileView({ filePath }: FileViewProps) {
itemFileError,
itemCombinationDataFileError,
questFileError,
zoneDataFileError,
]);

const getDirectoryPath = (filePath: string): string => {
Expand Down Expand Up @@ -427,7 +443,8 @@ export function FileView({ filePath }: FileViewProps) {
dropFileError ||
itemFileError ||
itemCombinationDataFileError ||
questFileError) && (
questFileError ||
zoneDataFileError) && (
<Alert variant="destructive" className="mb-6">
<AlertCircle className="h-4 w-4" />
<AlertDescription>{fileContentErrorMessage}</AlertDescription>
Expand Down Expand Up @@ -668,6 +685,19 @@ export function FileView({ filePath }: FileViewProps) {
</>
)}

{fileType === 'a3_zone_data_file' && (
<>
{zoneDataFileLoading && (
<div className="flex h-96 items-center justify-center">
<Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
</div>
)}
{zoneDataFileData && !zoneDataFileError && (
<ZoneDataFileView data={zoneDataFileData} />
)}
</>
)}

{fileType &&
fileType !== 'text_file' &&
fileType !== 'a3_npc_file' &&
Expand All @@ -676,13 +706,15 @@ export function FileView({ filePath }: FileViewProps) {
!isItemFileType(fileType) &&
fileType !== 'a3_item_combination_data_file' &&
fileType !== 'a3_quest_file' &&
fileType !== 'a3_zone_data_file' &&
!textFileLoading &&
!npcFileLoading &&
!spawnFileLoading &&
!dropFileLoading &&
!itemFileLoading &&
!itemCombinationDataFileLoading &&
!questFileLoading && (
!questFileLoading &&
!zoneDataFileLoading && (
<Card>
<CardContent className="p-6 text-center text-muted-foreground">
File type &quot;{fileType}&quot; is not yet supported for
Expand Down
Loading
Loading