mirror of
https://github.com/arsvendg/Stirling-PDF.git
synced 2026-07-16 11:23:10 +02:00
Prettier 2: Electric Boogaloo (#6113)
# Description of Changes When I added Prettier formatting in #6052, my aim was to use just the default settings in Prettier. Turns out, Prettier looks _really hard_ for any config files if it's not explicitly given one, which means that if a developer has some sort of Prettier config file lying around on their system, Prettier might find it and use it. Also, Prettier changes its defaults based on stuff in `.editorconfig` without any good way of disabling that behaviour explicitly in its config file. To solve both of these issues, I've introduced a `.prettierrc` file which sets Prettier's defaults explicitly, and then reformatted all our code _again_ in Prettier's actual default settings. This should achieve the aim of #6052 and remove the possibility for it breaking on different dev computers.
This commit is contained in:
@@ -18,7 +18,12 @@ interface BulkUploadToServerModalProps {
|
||||
onUploaded?: () => Promise<void> | void;
|
||||
}
|
||||
|
||||
const BulkUploadToServerModal: React.FC<BulkUploadToServerModalProps> = ({ opened, onClose, files, onUploaded }) => {
|
||||
const BulkUploadToServerModal: React.FC<BulkUploadToServerModalProps> = ({
|
||||
opened,
|
||||
onClose,
|
||||
files,
|
||||
onUploaded,
|
||||
}) => {
|
||||
const { t } = useTranslation();
|
||||
const { actions } = useFileActions();
|
||||
const [isUploading, setIsUploading] = useState(false);
|
||||
@@ -39,11 +44,23 @@ const BulkUploadToServerModal: React.FC<BulkUploadToServerModalProps> = ({ opene
|
||||
setErrorMessage(null);
|
||||
|
||||
try {
|
||||
const rootIds = Array.from(new Set(files.map((file) => (file.originalFileId || file.id) as FileId)));
|
||||
const remoteIds = Array.from(new Set(files.map((file) => file.remoteStorageId).filter(Boolean) as number[]));
|
||||
const existingRemoteId = remoteIds.length === 1 ? remoteIds[0] : undefined;
|
||||
const rootIds = Array.from(
|
||||
new Set(
|
||||
files.map((file) => (file.originalFileId || file.id) as FileId),
|
||||
),
|
||||
);
|
||||
const remoteIds = Array.from(
|
||||
new Set(
|
||||
files.map((file) => file.remoteStorageId).filter(Boolean) as number[],
|
||||
),
|
||||
);
|
||||
const existingRemoteId =
|
||||
remoteIds.length === 1 ? remoteIds[0] : undefined;
|
||||
|
||||
const { remoteId, updatedAt, chain } = await uploadHistoryChains(rootIds, existingRemoteId);
|
||||
const { remoteId, updatedAt, chain } = await uploadHistoryChains(
|
||||
rootIds,
|
||||
existingRemoteId,
|
||||
);
|
||||
|
||||
for (const stub of chain) {
|
||||
actions.updateStirlingFileStub(stub.id, {
|
||||
@@ -72,7 +89,12 @@ const BulkUploadToServerModal: React.FC<BulkUploadToServerModalProps> = ({ opene
|
||||
onClose();
|
||||
} catch (error) {
|
||||
console.error("Failed to upload files to server:", error);
|
||||
setErrorMessage(t("storageUpload.failure", "Upload failed. Please check your login and storage settings."));
|
||||
setErrorMessage(
|
||||
t(
|
||||
"storageUpload.failure",
|
||||
"Upload failed. Please check your login and storage settings.",
|
||||
),
|
||||
);
|
||||
} finally {
|
||||
setIsUploading(false);
|
||||
}
|
||||
@@ -87,7 +109,12 @@ const BulkUploadToServerModal: React.FC<BulkUploadToServerModalProps> = ({ opene
|
||||
zIndex={Z_INDEX_OVER_FILE_MANAGER_MODAL}
|
||||
>
|
||||
<Stack gap="sm">
|
||||
<Text size="sm">{t("storageUpload.bulkDescription", "This uploads the selected files to your server storage.")}</Text>
|
||||
<Text size="sm">
|
||||
{t(
|
||||
"storageUpload.bulkDescription",
|
||||
"This uploads the selected files to your server storage.",
|
||||
)}
|
||||
</Text>
|
||||
<Text size="sm" c="dimmed">
|
||||
{t("storageUpload.fileCount", "{{count}} files selected", {
|
||||
count: files.length,
|
||||
@@ -105,7 +132,10 @@ const BulkUploadToServerModal: React.FC<BulkUploadToServerModalProps> = ({ opene
|
||||
)}
|
||||
|
||||
{errorMessage && (
|
||||
<Alert color="red" title={t("storageUpload.errorTitle", "Upload failed")}>
|
||||
<Alert
|
||||
color="red"
|
||||
title={t("storageUpload.errorTitle", "Upload failed")}
|
||||
>
|
||||
{errorMessage}
|
||||
</Alert>
|
||||
)}
|
||||
@@ -114,7 +144,11 @@ const BulkUploadToServerModal: React.FC<BulkUploadToServerModalProps> = ({ opene
|
||||
<Button variant="default" onClick={onClose} disabled={isUploading}>
|
||||
{t("cancel", "Cancel")}
|
||||
</Button>
|
||||
<Button leftSection={<CloudUploadIcon style={{ fontSize: 18 }} />} onClick={handleUpload} loading={isUploading}>
|
||||
<Button
|
||||
leftSection={<CloudUploadIcon style={{ fontSize: 18 }} />}
|
||||
onClick={handleUpload}
|
||||
loading={isUploading}
|
||||
>
|
||||
{t("storageUpload.uploadButton", "Upload to Server")}
|
||||
</Button>
|
||||
</Group>
|
||||
|
||||
Reference in New Issue
Block a user