@d-mok/quasar-app-extension-quasar-axe 1.0.76 → 1.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d-mok/quasar-app-extension-quasar-axe",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "A Quasar App Extension",
   "author": "d-mok <49301824+d-mok@users.noreply.github.com>",
   "license": "MIT",

package/src/utils/dialog.ts

@@ -66,7 +66,6 @@ function extractObj<T extends object>(
 class QDialog {
     /**
      * The basic dialog. If cancel, throw error.
-     * For interal use.
      */
     private async baseDialog(options: QDialogOptions): Promise<string> {
         let base: QDialogOptions = {
@@ -87,6 +86,61 @@ class QDialog {
             })
     }
 
+    /**
+     * The basic textarea.
+     */
+    private async baseTextarea(options: QDialogOptions): Promise<string> {
+        let { prompt, ...rest } = options
+        let str = await this.baseDialog({
+            prompt: {
+                type: 'textarea',
+                outlined: true,
+                //@ts-ignore // This is a bug from quasar
+                style: "font-family: 'Courier New', monospace;",
+                rows: 20,
+                ...prompt,
+            },
+            ...rest,
+        })
+        return str
+    }
+
+    /**
+     * The basic CSV.
+     */
+    private async baseCSV(
+        options: QDialogOptions,
+        sample: object[]
+    ): Promise<string> {
+        let words = unparseCSV(sample)
+            .split('\n')
+            .flatMap(l => l.split('\t'))
+        let maxWordLength = Math.max(0, ...words.map($ => $.length))
+
+        let lines = unparseCSV(sample)
+            .split('\n')
+            .map($ => $.replace('\t', ' '.repeat(maxWordLength + 2)))
+        let maxLineLength = Math.max(0, ...lines.map($ => $.length))
+
+        let { prompt, ...rest } = options
+        let csv = await this.baseDialog({
+            prompt: {
+                type: 'textarea',
+                outlined: true,
+                //@ts-ignore // This is a bug from quasar
+                style:
+                    "font-family: 'Courier New', monospace;" +
+                    'tab-size: ' +
+                    (maxWordLength + 2),
+                rows: 20,
+                ...prompt,
+            },
+            fullWidth: maxLineLength > 35,
+            ...rest,
+        })
+        return csv
+    }
+
     /**
      * Show a confirm dialog.
      * If OK, continue. If cancel, throw error.
@@ -194,13 +248,11 @@ class QDialog {
         prefill: string = '',
         isValid: Predicate<string> = $ => true
     ): Promise<string> {
-        return this.baseDialog({
+        return this.baseTextarea({
             title,
             message,
             prompt: {
                 model: prefill,
-                type: 'textarea',
-                outlined: true,
                 isValid: isValid,
             },
         })
@@ -288,37 +340,20 @@ class QDialog {
         if (sample.length === 0)
             throw 'Dialog askCSV must provide at least one sample object.'
 
-        let words = unparseCSV(sample)
-            .split('\n')
-            .flatMap(l => l.split('\t'))
-        let maxWordLength = Math.max(...words.map($ => $.length))
-
-        let lines = unparseCSV(sample)
-            .split('\n')
-            .map($ => $.replace('\t', ' '.repeat(maxWordLength + 2)))
-        let maxLineLength = Math.max(...lines.map($ => $.length))
-
-        let csv = await this.baseDialog({
-            title,
-            message,
-            prompt: {
-                model: unparseCSV(sample),
-                type: 'textarea',
-                outlined: true,
-                isValid: (csv: string) =>
-                    parseCSV(csv, sample[0]).every(
-                        $ => schemaEqual($, sample[0]) && isValid($)
-                    ),
-                //@ts-ignore // This is a bug from quasar
-                style:
-                    "font-family: 'Courier New', monospace;" +
-                    'tab-size: ' +
-                    (maxWordLength + 2),
-                rows: Math.min(25, sample.length + 1),
-                cols: maxLineLength + 5,
+        let csv = await this.baseCSV(
+            {
+                title,
+                message,
+                prompt: {
+                    model: unparseCSV(sample),
+                    isValid: (csv: string) =>
+                        parseCSV(csv, sample[0]).every(
+                            $ => schemaEqual($, sample[0]) && isValid($)
+                        ),
+                },
             },
-            // fullWidth: maxLineLength > 35,
-        })
+            sample
+        )
         return parseCSV(csv, sample[0])
     }
 
@@ -341,13 +376,11 @@ class QDialog {
             return s.split('\n').filter($ => $.trim() !== '')
         }
 
-        let str = await this.baseDialog({
+        let str = await this.baseTextarea({
             title,
             message,
             prompt: {
                 model: sample.join('\n'),
-                type: 'textarea',
-                outlined: true,
                 isValid: (s: string) => strToArr(s).every(isValid),
             },
         })
@@ -366,41 +399,14 @@ class QDialog {
         message: string = '',
         content: string = ''
     ): Promise<void> {
-        await this.baseDialog({
+        await this.baseTextarea({
             title,
             message,
             prompt: {
                 model: content,
-                type: 'textarea',
-                outlined: true,
             },
             cancel: false,
-        })
-    }
-
-    /**
-     * Show a dialog with big text area display.
-     * @param title - the title
-     * @param message - the message
-     * @param content - content string in the text area
-     */
-    async showBigTextarea(
-        title: string,
-        message: string = '',
-        content: string = ''
-    ): Promise<void> {
-        await this.baseDialog({
-            title,
-            message,
-            prompt: {
-                model: content,
-                type: 'textarea',
-                outlined: true,
-                //@ts-ignore // This is a bug from quasar
-                rows: 25,
-            },
-            cancel: false,
-            fullWidth: true,
+            fullWidth: content.length > 200,
         })
     }
 
@@ -419,46 +425,17 @@ class QDialog {
         let filteredContent: Partial<T>[] = [...content]
         if (fields.length > 0)
             filteredContent = content.map($ => extractObj($, fields))
-        await this.baseDialog({
-            title,
-            message,
-            prompt: {
-                model: unparseCSV(filteredContent),
-                type: 'textarea',
-                outlined: true,
-            },
-            cancel: false,
-        })
-    }
-
-    /**
-     * Show a dialog with big CSV display.
-     * @param title - the title
-     * @param message - the message
-     * @param content - objects to display as CSV
-     */
-    async showBigCSV<T extends object>(
-        title: string,
-        message: string = '',
-        content: T[] = [],
-        fields: strKeyOf<T>[] = []
-    ): Promise<void> {
-        let filteredContent: Partial<T>[] = [...content]
-        if (fields.length > 0)
-            filteredContent = content.map($ => extractObj($, fields))
-        await this.baseDialog({
-            title,
-            message,
-            prompt: {
-                model: unparseCSV(filteredContent),
-                type: 'textarea',
-                outlined: true,
-                //@ts-ignore // This is a bug from quasar
-                rows: 25,
+        await this.baseCSV(
+            {
+                title,
+                message,
+                prompt: {
+                    model: unparseCSV(filteredContent),
+                },
+                cancel: false,
             },
-            cancel: false,
-            fullWidth: true,
-        })
+            filteredContent
+        )
     }
 
     /**
@@ -472,13 +449,11 @@ class QDialog {
         message: string = '',
         content: T[] = []
     ): Promise<void> {
-        await this.baseDialog({
+        await this.baseTextarea({
             title,
             message,
             prompt: {
                 model: content.map($ => String($)).join('\n'),
-                type: 'textarea',
-                outlined: true,
             },
             cancel: false,
         })