TagSpaces is an offline, open source, document manager with tagging support
e2e fixes
sytolk3eeae103f8ce
diff --git a/src/main/main.ts b/src/main/main.tsindex 14686600e..7a2d7c4b2 100644--- a/src/main/main.ts+++ b/src/main/main.ts@@ -659,6 +659,14 @@ appi18n.changeLanguage(language);});+ ipcMain.on('cmd', (e, cmd) => {+ if (cmd === 'previous-file') {+ getPreviousFile();+ } else if (cmd === 'next-file') {+ getNextFile();+ }+ });+ipcMain.on('setZoomFactor', (event, zoomLevel) => {mainWindow?.webContents.setZoomFactor(zoomLevel);});diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsxindex 642e2ff5d..9ff33dc4b 100644--- a/src/renderer/components/EntryContainer.tsx+++ b/src/renderer/components/EntryContainer.tsx@@ -24,7 +24,7 @@ import React, {useRef,useState,} from 'react';-import { useDispatch, useSelector } from 'react-redux';+import { useSelector } from 'react-redux';import { GlobalHotKeys } from 'react-hotkeys';import fscreen from 'fscreen';import Button from '@mui/material/Button';@@ -49,7 +49,7 @@ import {isRevisionsEnabled,getEntryContainerTab,} from '-/reducers/settings';-import { OpenedEntry, AppDispatch } from '-/reducers/app';+import { OpenedEntry } from '-/reducers/app';import useEventListener from '-/utils/useEventListener';import { TS } from '-/tagspaces.namespace';import FileView from '-/components/FileView';@@ -69,7 +69,6 @@ import { useNotificationContext } from '-/hooks/useNotificationContext';import { toFsEntry } from '-/services/utils-io';import { usePlatformFacadeContext } from '-/hooks/usePlatformFacadeContext';import { SaveIcon, EditIcon } from '-/components/CommonIcons';-import { useRendererListenerContext } from '-/hooks/useRendererListenerContext';//const defaultSplitSize = '7.86%'; // '7.2%'; // 103;// const bufferedSplitResize = buffer({@@ -81,7 +80,7 @@ const historyKeys = Pro && Pro.history ? Pro.history.historyKeys : {};function EntryContainer() {const { t } = useTranslation();- const dispatch: AppDispatch = useDispatch();+ // const dispatch: AppDispatch = useDispatch();const {openedEntries,closeAllFiles,@@ -90,7 +89,6 @@ function EntryContainer() {toggleEntryFullWidth,isEntryInFullWidth,} = useOpenedEntryContext();- const { openPrevFile, openNextFile } = useRendererListenerContext();const { saveDescription } = useDescriptionContext();const { readOnlyMode, switchLocationTypeByID, switchCurrentLocationType } =useCurrentLocationContext();@@ -655,11 +653,13 @@ function EntryContainer() {setPanelOpened(!isPanelOpened);};const openNextFileAction = () => {- openNextFile(openedFile.path);+ window.electronIO.ipcRenderer.sendMessage('cmd', 'next-file');+ //openNextFile(openedFile.path);};const openPrevFileAction = () => {- openPrevFile(openedFile.path);+ window.electronIO.ipcRenderer.sendMessage('cmd', 'previous-file');+ //openPrevFile(openedFile.path);};const fileExtension = extractFileExtension(diff --git a/src/renderer/components/EntryContainerNav.tsx b/src/renderer/components/EntryContainerNav.tsxindex 077c1e478..6d5d73d79 100644--- a/src/renderer/components/EntryContainerNav.tsx+++ b/src/renderer/components/EntryContainerNav.tsx@@ -8,7 +8,6 @@ import NextDocumentIcon from '@mui/icons-material/KeyboardArrowDown';import Tooltip from '-/components/Tooltip';import { useTranslation } from 'react-i18next';import { getKeyBindingObject } from '-/reducers/settings';-import { useRendererListenerContext } from '-/hooks/useRendererListenerContext';interface Props {isFile: boolean;@@ -19,7 +18,6 @@ function EntryContainerNav(props: Props) {const { isFile, startClosingEntry } = props;const keyBindings = useSelector(getKeyBindingObject);const { t } = useTranslation();- const { openNextFile, openPrevFile } = useRendererListenerContext();const theme = useTheme();return (@@ -43,7 +41,13 @@ function EntryContainerNav(props: Props) {<IconButtonaria-label={t('core:openPrevFileTooltip')}data-tid="fileContainerPrevFile"- onClick={() => openPrevFile()}+ onClick={() => {+ window.electronIO.ipcRenderer.sendMessage(+ 'cmd',+ 'previous-file',+ );+ //openPrevFile()+ }}// size="large"><PrevDocumentIcon />@@ -56,7 +60,10 @@ function EntryContainerNav(props: Props) {<IconButtonaria-label={t('core:openNextFileTooltip')}data-tid="fileContainerNextFile"- onClick={() => openNextFile()}+ onClick={() => {+ window.electronIO.ipcRenderer.sendMessage('cmd', 'next-file');+ // openNextFile()+ }}// size="large"><NextDocumentIcon />diff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.jsindex 99aa63361..0f9214b49 100644--- a/tests/e2e/fileopener.pw.e2e.js+++ b/tests/e2e/fileopener.pw.e2e.js@@ -93,6 +93,7 @@ test.describe('TST08 - File folder properties', () => {//Toggle Properties//await clickOn('[data-tid=fileContainerToggleProperties]');+ await expectElementExist('[data-tid=detailsTabTID]', true, 5000);await clickOn('[data-tid=detailsTabTID]');const propsFileName = await getPropertiesFileName();const firstFileName = await getGridFileName(0);diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex dc5c85bf2..984d63f22 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -177,16 +177,18 @@ export async function getGridFileName(fileIndex) {? filesList[filesList.length + fileIndex]: filesList[fileIndex];// await file.waitForDisplayed({ timeout: 5000 });- file = await file.$('div');- file = await file.$('div');- file = await file.$('div');- const fileNameElem = await file.$('p');- const fileName = await getElementText(fileNameElem);+ //file = await file.$('div');+ //file = await file.$('div');+ //file = await file.$('div');+ const fileNameElem = await file.$('div div div:nth-child(2) p');+ const fileName = await fileNameElem.getAttribute('title');+ return fileName;+ /*const fileName = await getElementText(fileNameElem);const divs = await file.$$('div');const lastDiv = await divs[divs.length - 1];const fileExtElem = await lastDiv.$('span');const fileExt = await getElementText(fileExtElem);- return fileName + '.' + fileExt.toLowerCase();+ return fileName + '.' + fileExt.toLowerCase();*/}console.log("Can't find getGridFileName:" + fileIndex + ' filesList is empty',