Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

chore(client/ts): port import dialog

Browse Source
This commit is contained in:
Elian Doran
2025-03-20 10:38:45 +02:00
parent 3527ab2c5d
commit 8f6fcee67d
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/public/app/services/import.ts
View File

@@ -5,13 +5,15 @@ import utils from "./utils.js";
import appContext from "../components/app_context.js"; import appContext from "../components/app_context.js";
import { t } from "./i18n.js"; import { t } from "./i18n.js";
interface UploadFilesOptions { type BooleanLike = boolean | "true" | "false";
safeImport?: boolean;
shrinkImages: boolean | "true" | "false"; export interface UploadFilesOptions {
textImportedAsText?: boolean; safeImport?: BooleanLike;
codeImportedAsCode?: boolean; shrinkImages: BooleanLike;
explodeArchives?: boolean; textImportedAsText?: BooleanLike;
replaceUnderscoresWithSpaces?: boolean; codeImportedAsCode?: BooleanLike;
explodeArchives?: BooleanLike;
replaceUnderscoresWithSpaces?: BooleanLike;
} }
export async function uploadFiles(entityType: string, parentNoteId: string, files: string[] | File[], options: UploadFilesOptions) { export async function uploadFiles(entityType: string, parentNoteId: string, files: string[] | File[], options: UploadFilesOptions) {

31
src/public/app/widgets/dialogs/import.js → src/public/app/widgets/dialogs/import.ts
View File

@@ -1,10 +1,11 @@
import utils, { escapeQuotes } from "../../services/utils.js"; import utils, { escapeQuotes } from "../../services/utils.js";
import treeService from "../../services/tree.js"; import treeService from "../../services/tree.js";
import importService from "../../services/import.js"; import importService, { type UploadFilesOptions } from "../../services/import.js";
import options from "../../services/options.js"; import options from "../../services/options.js";
import BasicWidget from "../basic_widget.js"; import BasicWidget from "../basic_widget.js";
import { t } from "../../services/i18n.js"; import { t } from "../../services/i18n.js";
import { Modal, Tooltip } from "bootstrap"; import { Modal, Tooltip } from "bootstrap";
import type { EventData } from "../../components/app_context.js";
const TPL = ` const TPL = `
<div class="import-dialog modal fade mx-auto" tabindex="-1" role="dialog"> <div class="import-dialog modal fade mx-auto" tabindex="-1" role="dialog">
@@ -79,6 +80,20 @@ const TPL = `
</div>`; </div>`;
export default class ImportDialog extends BasicWidget { export default class ImportDialog extends BasicWidget {
private parentNoteId: string | null;
private $form!: JQuery<HTMLElement>;
private $noteTitle!: JQuery<HTMLElement>;
private $fileUploadInput!: JQuery<HTMLInputElement>;
private $importButton!: JQuery<HTMLElement>;
private $safeImportCheckbox!: JQuery<HTMLElement>;
private $shrinkImagesCheckbox!: JQuery<HTMLElement>;
private $textImportedAsTextCheckbox!: JQuery<HTMLElement>;
private $codeImportedAsCodeCheckbox!: JQuery<HTMLElement>;
private $explodeArchivesCheckbox!: JQuery<HTMLElement>;
private $replaceUnderscoresWithSpacesCheckbox!: JQuery<HTMLElement>;
constructor() { constructor() {
super(); super();
@@ -87,7 +102,7 @@ export default class ImportDialog extends BasicWidget {
doRender() { doRender() {
this.$widget = $(TPL); this.$widget = $(TPL);
Modal.getOrCreateInstance(this.$widget); Modal.getOrCreateInstance(this.$widget[0]);
this.$form = this.$widget.find(".import-form"); this.$form = this.$widget.find(".import-form");
this.$noteTitle = this.$widget.find(".import-note-title"); this.$noteTitle = this.$widget.find(".import-note-title");
@@ -104,7 +119,9 @@ export default class ImportDialog extends BasicWidget {
// disabling so that import is not triggered again. // disabling so that import is not triggered again.
this.$importButton.attr("disabled", "disabled"); this.$importButton.attr("disabled", "disabled");
if (this.parentNoteId) {
this.importIntoNote(this.parentNoteId); this.importIntoNote(this.parentNoteId);
}
return false; return false;
}); });
@@ -124,7 +141,7 @@ export default class ImportDialog extends BasicWidget {
}); });
} }
async showImportDialogEvent({ noteId }) { async showImportDialogEvent({ noteId }: EventData<"showImportDialog">) {
this.parentNoteId = noteId; this.parentNoteId = noteId;
this.$fileUploadInput.val("").trigger("change"); // to trigger Import button disabling listener below this.$fileUploadInput.val("").trigger("change"); // to trigger Import button disabling listener below
@@ -141,12 +158,12 @@ export default class ImportDialog extends BasicWidget {
utils.openDialog(this.$widget); utils.openDialog(this.$widget);
} }
async importIntoNote(parentNoteId) { async importIntoNote(parentNoteId: string) {
const files = Array.from(this.$fileUploadInput[0].files); // shallow copy since we're resetting the upload button below const files = Array.from(this.$fileUploadInput[0].files ?? []); // shallow copy since we're resetting the upload button below
const boolToString = ($el) => ($el.is(":checked") ? "true" : "false"); const boolToString = ($el: JQuery<HTMLElement>) => ($el.is(":checked") ? "true" : "false");
const options = { const options: UploadFilesOptions = {
safeImport: boolToString(this.$safeImportCheckbox), safeImport: boolToString(this.$safeImportCheckbox),
shrinkImages: boolToString(this.$shrinkImagesCheckbox), shrinkImages: boolToString(this.$shrinkImagesCheckbox),
textImportedAsText: boolToString(this.$textImportedAsTextCheckbox), textImportedAsText: boolToString(this.$textImportedAsTextCheckbox),