2
0
mirror of https://github.com/frappe/books.git synced 2024-11-09 23:30:56 +00:00

refactor: move ipc call out of vue components

This commit is contained in:
18alantom 2022-10-25 13:43:00 +05:30
parent b24fd1123d
commit 92b8f61e03
6 changed files with 58 additions and 40 deletions

View File

@ -2,6 +2,7 @@ import { app, dialog, ipcMain } from 'electron';
import { autoUpdater } from 'electron-updater'; import { autoUpdater } from 'electron-updater';
import fs from 'fs/promises'; import fs from 'fs/promises';
import path from 'path'; import path from 'path';
import { SelectFileOptions, SelectFileReturn } from 'utils/types';
import databaseManager from '../backend/database/manager'; import databaseManager from '../backend/database/manager';
import { emitMainProcessError } from '../backend/helpers'; import { emitMainProcessError } from '../backend/helpers';
import { Main } from '../main'; import { Main } from '../main';
@ -13,7 +14,7 @@ import {
getConfigFilesWithModified, getConfigFilesWithModified,
getErrorHandledReponse, getErrorHandledReponse,
isNetworkError, isNetworkError,
setAndGetCleanedConfigFiles setAndGetCleanedConfigFiles,
} from './helpers'; } from './helpers';
import { saveHtmlAsPdf } from './saveHtmlAsPdf'; import { saveHtmlAsPdf } from './saveHtmlAsPdf';
@ -82,8 +83,10 @@ export default function registerIpcMainActionListeners(main: Main) {
return obj; return obj;
}); });
ipcMain.handle(IPC_ACTIONS.GET_FILE, async (event, options) => { ipcMain.handle(
const response = { IPC_ACTIONS.SELECT_FILE,
async (_, options: SelectFileOptions): Promise<SelectFileReturn> => {
const response: SelectFileReturn = {
name: '', name: '',
filePath: '', filePath: '',
success: false, success: false,
@ -92,7 +95,7 @@ export default function registerIpcMainActionListeners(main: Main) {
}; };
const { filePaths, canceled } = await dialog.showOpenDialog( const { filePaths, canceled } = await dialog.showOpenDialog(
main.mainWindow!, main.mainWindow!,
options { ...options, properties: ['openFile'] }
); );
response.filePath = filePaths?.[0]; response.filePath = filePaths?.[0];
@ -110,7 +113,8 @@ export default function registerIpcMainActionListeners(main: Main) {
response.name = path.basename(response.filePath); response.name = path.basename(response.filePath);
response.data = await fs.readFile(response.filePath); response.data = await fs.readFile(response.filePath);
return response; return response;
}); }
);
ipcMain.handle(IPC_ACTIONS.GET_CREDS, async (event) => { ipcMain.handle(IPC_ACTIONS.GET_CREDS, async (event) => {
return await getUrlAndTokenString(); return await getUrlAndTokenString();

View File

@ -60,10 +60,9 @@
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { ipcRenderer } from 'electron';
import { fyo } from 'src/initFyo'; import { fyo } from 'src/initFyo';
import { selectFile } from 'src/utils/ipcCalls';
import { getDataURL } from 'src/utils/misc'; import { getDataURL } from 'src/utils/misc';
import { IPC_ACTIONS } from 'utils/messages';
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FeatherIcon from '../FeatherIcon.vue'; import FeatherIcon from '../FeatherIcon.vue';
import Base from './Base.vue'; import Base from './Base.vue';
@ -92,15 +91,12 @@ export default defineComponent({
} }
const options = { const options = {
title: fyo.t`Select Image`, title: fyo.t`Select Image`,
properties: ['openFile'],
filters: [ filters: [
{ name: 'Image', extensions: ['png', 'jpg', 'jpeg', 'webp'] }, { name: 'Image', extensions: ['png', 'jpg', 'jpeg', 'webp'] },
], ],
}; };
const { name, success, data } = await ipcRenderer.invoke(
IPC_ACTIONS.SELECT_FILE, const { name, success, data } = await selectFile(options);
options
);
if (!success) { if (!success) {
return; return;

View File

@ -345,7 +345,6 @@
</div> </div>
</template> </template>
<script> <script>
import { ipcRenderer } from 'electron';
import Button from 'src/components/Button.vue'; import Button from 'src/components/Button.vue';
import FormControl from 'src/components/Controls/FormControl.vue'; import FormControl from 'src/components/Controls/FormControl.vue';
import DropdownWithActions from 'src/components/DropdownWithActions.vue'; import DropdownWithActions from 'src/components/DropdownWithActions.vue';
@ -354,10 +353,9 @@ import HowTo from 'src/components/HowTo.vue';
import PageHeader from 'src/components/PageHeader.vue'; import PageHeader from 'src/components/PageHeader.vue';
import { importable, Importer } from 'src/dataImport'; import { importable, Importer } from 'src/dataImport';
import { fyo } from 'src/initFyo'; import { fyo } from 'src/initFyo';
import { getSavePath, saveData } from 'src/utils/ipcCalls'; import { getSavePath, saveData, selectFile } from 'src/utils/ipcCalls';
import { docsPathMap } from 'src/utils/misc'; import { docsPathMap } from 'src/utils/misc';
import { docsPath, showMessageDialog } from 'src/utils/ui'; import { docsPath, showMessageDialog } from 'src/utils/ui';
import { IPC_ACTIONS } from 'utils/messages';
import Loading from '../components/Loading.vue'; import Loading from '../components/Loading.vue';
export default { export default {
@ -618,12 +616,12 @@ export default {
async selectFile() { async selectFile() {
const options = { const options = {
title: this.t`Select File`, title: this.t`Select File`,
properties: ['openFile'],
filters: [{ name: 'CSV', extensions: ['csv'] }], filters: [{ name: 'CSV', extensions: ['csv'] }],
}; };
const { success, canceled, filePath, data, name } = const { success, canceled, filePath, data, name } = await selectFile(
await ipcRenderer.invoke(IPC_ACTIONS.GET_FILE, options); options
);
if (!success && !canceled) { if (!success && !canceled) {
return await showMessageDialog({ return await showMessageDialog({

View File

@ -6,9 +6,16 @@ import { t } from 'fyo';
import { BaseError } from 'fyo/utils/errors'; import { BaseError } from 'fyo/utils/errors';
import { BackendResponse } from 'utils/ipc/types'; import { BackendResponse } from 'utils/ipc/types';
import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages'; import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
import { SelectFileOptions, SelectFileReturn } from 'utils/types';
import { setLanguageMap } from './language'; import { setLanguageMap } from './language';
import { showMessageDialog, showToast } from './ui'; import { showMessageDialog, showToast } from './ui';
export async function selectFile(
options: SelectFileOptions
): Promise<SelectFileReturn> {
return await ipcRenderer.invoke(IPC_ACTIONS.SELECT_FILE, options);
}
export async function checkForUpdates() { export async function checkForUpdates() {
await ipcRenderer.invoke(IPC_ACTIONS.CHECK_FOR_UPDATES); await ipcRenderer.invoke(IPC_ACTIONS.CHECK_FOR_UPDATES);
await setLanguageMap(); await setLanguageMap();

View File

@ -19,7 +19,7 @@ export enum IPC_ACTIONS {
SEND_ERROR = 'send-error', SEND_ERROR = 'send-error',
GET_LANGUAGE_MAP = 'get-language-map', GET_LANGUAGE_MAP = 'get-language-map',
CHECK_FOR_UPDATES = 'check-for-updates', CHECK_FOR_UPDATES = 'check-for-updates',
GET_FILE = 'get-file', SELECT_FILE = 'select-file',
GET_CREDS = 'get-creds', GET_CREDS = 'get-creds',
GET_DB_LIST = 'get-db-list', GET_DB_LIST = 'get-db-list',
DELETE_FILE = 'delete-file', DELETE_FILE = 'delete-file',

View File

@ -31,3 +31,16 @@ export type UnexpectedLogObject = {
stack: string; stack: string;
more: Record<string, unknown>; more: Record<string, unknown>;
} }
export interface SelectFileOptions {
title: string;
filters?: { name: string; extensions: string[] }[];
}
export interface SelectFileReturn {
name: string;
filePath: string;
success: boolean;
data: Buffer;
canceled: boolean;
}