Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix KanBan hide columns and add e2e test (#2231)

Stanimira80443f49f02
diff --git a/package-lock.json b/package-lock.json
index c81b4a670..cfbf5cbcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -199,7 +199,7 @@
"yarn": "please-use-npm"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.105"
+ "@tagspacespro/tagspacespro": "5.0.106"
}
},
"node_modules/@adobe/css-tools": {
@@ -15880,9 +15880,9 @@
}
},
"node_modules/@tagspacespro/tagspacespro": {
- "version": "5.0.105",
- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.105/d9f345ecfa2114970528a23e27c2269f7f4e5bae",
- "integrity": "sha512-VlufLUQmyPfo7vUNMZRIuQcvm5mR+kXikfq0szrKoUaTIdvFqqZJZ4NiVdPCHlfqyAC58ek53ZRuhnVBUzZQTw==",
+ "version": "5.0.106",
+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.106/5d942ab39a1b0b918fb1f402c2973bd4889b8ca4",
+ "integrity": "sha512-FKsVVIMJz4HozAaUMiMCg3z3nMnrGk+sapHlmXvxKCoOVMr5ziiYci4xq3yhqhnnWcDGfrDnByR5d2sUzQeMqw==",
"license": "Proprietary",
"optional": true
},
diff --git a/package.json b/package.json
index e09a42a8f..84cd1bdb4 100644
--- a/package.json
+++ b/package.json
@@ -236,7 +236,7 @@
"uuid": "^9.0.0"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.105"
+ "@tagspacespro/tagspacespro": "5.0.106"
},
"devDependencies": {
"@electron/notarize": "^2.3.2",
diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsx
index e27420c41..235ef8cfa 100644
--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx
+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx
@@ -34,8 +34,10 @@ import {
getShowUnixHiddenEntries,
} from '-/reducers/settings';
import {
+ cleanMetaData,
executePromisesInBatches,
instanceId,
+ mergeFsEntryMeta,
updateFsEntries,
} from '-/services/utils-io';
import { TS } from '-/tagspaces.namespace';
@@ -245,11 +247,12 @@ export const DirectoryContentContextProvider = ({
//const isMetaFolderExist = useRef<boolean>(undefined);
const currentDirectoryPath = useRef<string>(undefined);
const currentDirectoryFiles = useRef<TS.OrderVisibilitySettings[]>([]);
- const currentDirectoryDirs = useRef<TS.OrderVisibilitySettings[]>([]);
+ const currentDirectoryDirs = useRef<TS.OrderVisibilitySettings[]>(undefined);
const firstRender = useFirstRender();
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
const broadcast = new BroadcastChannel('ts-directory-channel');
+ const defaultColumnsToShow = 3;
const currentLocation = findLocation(currentLocationId);
useEffect(() => {
@@ -336,8 +339,9 @@ export const DirectoryContentContextProvider = ({
if (!firstRender && metaActions && metaActions.length > 0) {
for (const action of metaActions) {
if (
+ action.entry &&
cleanTrailingDirSeparator(currentDirectoryPath.current) ===
- cleanTrailingDirSeparator(action.entry.path)
+ cleanTrailingDirSeparator(action.entry.path)
) {
if (action.action === 'perspectiveChange') {
if (action.entry.meta.perspective !== undefined) {
@@ -809,9 +813,34 @@ export const DirectoryContentContextProvider = ({
currentDirectoryDirs.current = meta.customOrder?.folders || [];
currentDirectoryFiles.current = meta.customOrder?.files || [];
} else {
- directoryMeta.current = getDefaultDirMeta();
- currentDirectoryDirs.current = [];
currentDirectoryFiles.current = [];
+ // add defaultColumnsToShow
+ const columnsToShow = entries
+ .filter((entry) => !entry.isFile)
+ .slice(0, defaultColumnsToShow);
+ currentDirectoryDirs.current = columnsToShow.map((dir) => ({
+ uuid: dir.uuid,
+ name: dir.name,
+ }));
+ const meta = cleanMetaData(
+ mergeFsEntryMeta({
+ ...getDefaultDirMeta(),
+ customOrder: {
+ folders: currentDirectoryDirs.current,
+ },
+ }),
+ );
+ directoryMeta.current = meta;
+ const content = JSON.stringify(meta);
+ const metaFilePath = getMetaFileLocationForDir(
+ directoryPath,
+ location.getDirSeparator(),
+ );
+ await location.saveTextFilePromise(
+ { path: metaFilePath, locationID: location.uuid },
+ content,
+ true,
+ );
}
// Set current directory entries
@@ -949,20 +978,25 @@ export const DirectoryContentContextProvider = ({
const reloadMeta =
cleanTrailingDirSeparator(currentDirectoryPath.current) ===
cleanTrailingDirSeparator(dirPath);
- return loadMetaDirectoryContent(
- dirPath,
- cLocation,
- showHiddenEntries,
- ).then((dirEntries) => {
- if (dirEntries && reloadMeta) {
- // load meta files (reload of the same directory is not handled from ThumbGenerationContextProvider)
- return loadCurrentDirMeta(dirPath, dirEntries).then((entries) => {
- updateCurrentDirEntries(entries);
- return true;
+ return loadMetaDirectoryContent(dirPath, cLocation, showHiddenEntries)
+ .then((dirEntries) => {
+ if (dirEntries && reloadMeta) {
+ // load meta files (reload of the same directory is not handled from ThumbGenerationContextProvider)
+ return loadCurrentDirMeta(dirPath, dirEntries).then(
+ (entries) => {
+ updateCurrentDirEntries(entries);
+ return true;
+ },
+ );
+ }
+ return true;
+ })
+ .then(() => {
+ setReflectMetaActions({
+ action: 'thumbGenerate',
});
- }
- return true;
- });
+ return true;
+ });
} else {
showNotification(t('core:invalidLink'), 'warning', true);
return false;
diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsx
index a9f12e88e..1c70ddaec 100644
--- a/src/renderer/hooks/IOActionsContextProvider.tsx
+++ b/src/renderer/hooks/IOActionsContextProvider.tsx
@@ -1648,7 +1648,7 @@ export const IOActionsContextProvider = ({
const metaDirectoryProperties =
await location.getPropertiesPromise(metaDirectoryPath);
if (!metaDirectoryProperties) {
- await createDirectoryPromise(metaDirectoryPath, location.uuid);
+ await createDirectoryPromise(metaDirectoryPath, location.uuid, false);
}
metaFilePath = getMetaFileLocationForDir(
diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsx
index 08e07f5f2..a16fcadcf 100644
--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx
+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx
@@ -242,6 +242,7 @@ export const OpenedEntryContextProvider = ({
for (const action of metaActions) {
if (
currentEntry.current &&
+ action.entry &&
currentEntry.current.path === action.entry.path
) {
if (
diff --git a/src/renderer/hooks/PaginationContextProvider.tsx b/src/renderer/hooks/PaginationContextProvider.tsx
index 493833045..511659def 100644
--- a/src/renderer/hooks/PaginationContextProvider.tsx
+++ b/src/renderer/hooks/PaginationContextProvider.tsx
@@ -22,6 +22,7 @@ import { defaultSettings } from '-/perspectives/grid';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
import { TS } from '-/tagspaces.namespace';
import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
+import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
type PaginationContextData = {
page: number;
@@ -44,6 +45,7 @@ export const PaginationContextProvider = ({
}: PaginationContextProviderProps) => {
const initPage = 1;
const { currentDirectoryPath, isSearchMode } = useDirectoryContentContext();
+ const { setReflectMetaActions } = useEditedEntryMetaContext();
const { settings, showDirectories } = usePerspectiveSettingsContext();
const { sortedDirContent } = useSortedDirContext();
@@ -91,17 +93,14 @@ export const PaginationContextProvider = ({
function setCurrentPage(currentPage: number) {
setPage(currentPage);
- /*const entries = getPageFiles(currentPage, sortedDirContent);
- return generateThumbnails(entries).then(() => {
- return loadCurrentDirMeta(
- currentDirectoryPath,
- currentDirectoryEntries,
- entries
- ).then(entries => {
- updateCurrentDirEntries(entries);
- return true;
- });
- });*/
+ const files = getPageFiles(currentPage, sortedDirContent);
+ if (files && files.length > 0) {
+ const actions: TS.EditMetaAction[] = files.map((file) => ({
+ action: 'thumbGenerate',
+ entry: file,
+ }));
+ setReflectMetaActions(...actions);
+ }
}
const context = useMemo(() => {
diff --git a/src/renderer/hooks/PlatformFacadeContextProvider.tsx b/src/renderer/hooks/PlatformFacadeContextProvider.tsx
index 46d25e1fc..08eb75b00 100644
--- a/src/renderer/hooks/PlatformFacadeContextProvider.tsx
+++ b/src/renderer/hooks/PlatformFacadeContextProvider.tsx
@@ -49,7 +49,11 @@ interface getLocationProps extends Omit<PlatformParms, 'path'> {
// All the properties from PlatformParms, except 'path'
}
type PlatformFacadeContextData = {
- createDirectoryPromise: (path: string, locationID?: string) => Promise<any>;
+ createDirectoryPromise: (
+ path: string,
+ locationID?: string,
+ reflect?: boolean,
+ ) => Promise<any>;
copyFilePromise: (
sourceFilePath: string,
targetFilePath: string,
@@ -188,13 +192,14 @@ export const PlatformFacadeContextProvider = ({
function createDirectoryPromise(
path: string,
locationID?: string,
+ reflect: boolean = true,
): Promise<any> {
ignoreByWatcher(path);
return getLocation({ locationID })
.createDirectoryPromise(path)
.then((result) => {
- if (result !== undefined) {
+ if (result !== undefined && reflect) {
// do not reflect if directory not created
reflectAddEntry(currentLocation.toFsEntry(path, false));
}
diff --git a/src/renderer/hooks/TagGroupsLocationContextProvider.tsx b/src/renderer/hooks/TagGroupsLocationContextProvider.tsx
index 89cde052d..4085e54eb 100644
--- a/src/renderer/hooks/TagGroupsLocationContextProvider.tsx
+++ b/src/renderer/hooks/TagGroupsLocationContextProvider.tsx
@@ -361,7 +361,7 @@ export const TagGroupsLocationContextProvider = ({
const metaDirectoryProperties =
await location.getPropertiesPromise(metaDirectoryPath);
if (!metaDirectoryProperties) {
- await createDirectoryPromise(metaDirectoryPath, location.uuid);
+ await createDirectoryPromise(metaDirectoryPath, location.uuid, false);
}
metaFilePath = getMetaFileLocationForDir(
diff --git a/src/renderer/hooks/ThumbGenerationContextProvider.tsx b/src/renderer/hooks/ThumbGenerationContextProvider.tsx
index caa73b2c1..1565d3525 100644
--- a/src/renderer/hooks/ThumbGenerationContextProvider.tsx
+++ b/src/renderer/hooks/ThumbGenerationContextProvider.tsx
@@ -82,7 +82,7 @@ export const ThumbGenerationContextProvider = ({
const { saveBinaryFilePromise, createDirectoryPromise } =
usePlatformFacadeContext();
const { metaActions } = useEditedEntryMetaContext();
- const { pageFiles, page } = usePaginationContext();
+ const { pageFiles } = usePaginationContext();
const { setGeneratingThumbs } = useNotificationContext();
const useGenerateThumbnails = useSelector(getUseGenerateThumbnails);
const enableWS = useSelector(getEnableWS);
@@ -111,7 +111,7 @@ export const ThumbGenerationContextProvider = ({
// 'bmp' currently electron main processed: https://github.com/lovell/sharp/issues/806
];
- useEffect(() => {
+ /*useEffect(() => {
if (currentDirectoryPath !== undefined) {
const entries =
pageFiles && pageFiles.length > 0 ? pageFiles : currentDirectoryEntries;
@@ -135,25 +135,39 @@ export const ThumbGenerationContextProvider = ({
});
}
}
- }, [currentDirectoryPath, page]); //, isMetaFolderExist]);
+ }, [currentDirectoryPath, page]); //, isMetaFolderExist]);*/
useEffect(() => {
if (!firstRender && metaActions && metaActions.length > 0) {
const entries = [];
+ let genThumbs = false;
for (const action of metaActions) {
if (action.action === 'thumbGenerate') {
- entries.push(action.entry);
+ genThumbs = true;
+ if (action.entry) {
+ entries.push(action.entry);
+ }
}
}
- if (entries.length > 0) {
- generateThumbnails(entries).then(() => {
- return loadCurrentDirMeta(currentDirectoryPath, entries).then(
- (ent) => {
- updateCurrentDirEntries(ent);
- return true;
- },
- );
- });
+ if (genThumbs) {
+ let genEntries;
+ if (entries.length > 0) {
+ genEntries = entries;
+ } else if (pageFiles && pageFiles.length > 0) {
+ genEntries = pageFiles;
+ } else {
+ genEntries = currentDirectoryEntries;
+ }
+ if (genEntries) {
+ generateThumbnails(genEntries).then(() => {
+ return loadCurrentDirMeta(currentDirectoryPath, genEntries).then(
+ (ent) => {
+ updateCurrentDirEntries(ent);
+ return true;
+ },
+ );
+ });
+ }
}
}
}, [metaActions]);
diff --git a/src/renderer/perspectives/grid/components/GridCell.tsx b/src/renderer/perspectives/grid/components/GridCell.tsx
index eaea2c10d..6729f051d 100644
--- a/src/renderer/perspectives/grid/components/GridCell.tsx
+++ b/src/renderer/perspectives/grid/components/GridCell.tsx
@@ -208,7 +208,7 @@ function GridCell(props: Props) {
useEffect(() => {
if (!firstRender && metaActions && metaActions.length > 0) {
for (const action of metaActions) {
- if (fsEntry.path === action.entry.path) {
+ if (action.entry && fsEntry.path === action.entry.path) {
if (
action.action === 'thumbChange' ||
action.action === 'bgdColorChange' ||
diff --git a/src/renderer/tagspaces.namespace.d.ts b/src/renderer/tagspaces.namespace.d.ts
index 5d3eccbba..08aff956a 100644
--- a/src/renderer/tagspaces.namespace.d.ts
+++ b/src/renderer/tagspaces.namespace.d.ts
@@ -134,7 +134,7 @@ export namespace TS {
| 'thumbGenerate'
| 'bgdImgChange'
| 'bgdColorChange';
- entry: TS.FileSystemEntry;
+ entry?: TS.FileSystemEntry;
}
interface PerspectiveActions {
diff --git a/tests/e2e/perspective-gallery.pw.e2e.js b/tests/e2e/perspective-gallery.pw.e2e.js
index 862caf4e7..ecd3a2bd6 100644
--- a/tests/e2e/perspective-gallery.pw.e2e.js
+++ b/tests/e2e/perspective-gallery.pw.e2e.js
@@ -73,16 +73,19 @@ test.describe('TST51 - Perspective openGalleryPerspective', () => {
await expectElementExist(
'[data-tid=OpenedTID' + dataTidFormat(fileName) + ']',
true,
+ 10000,
);
await clickOn('[data-tid=fileContainerNextFile]');
await expectElementExist(
'[data-tid=OpenedTID' + dataTidFormat(nextFileName) + ']',
true,
+ 4000,
);
await clickOn('[data-tid=fileContainerPrevFile]');
await expectElementExist(
'[data-tid=OpenedTID' + dataTidFormat(fileName) + ']',
true,
+ 4000,
);
});
});
diff --git a/tests/e2e/perspective-kanban.pw.e2e.js b/tests/e2e/perspective-kanban.pw.e2e.js
index e49f3e686..6b3173dc0 100644
--- a/tests/e2e/perspective-kanban.pw.e2e.js
+++ b/tests/e2e/perspective-kanban.pw.e2e.js
@@ -76,6 +76,11 @@ test.describe('TST49 - Perspective KanBan', () => {
);
await clickOn('[data-tid=MoveTargetempty_folder]');
await clickOn('[data-tid=confirmMoveFiles]');
+
+ // hide empty_folder in order to expect moved file is not shown
+ await clickOn('[data-tid=empty_folderKanBanColumnActionTID]');
+ await clickOn('[data-tid=columnVisibilityTID]');
+
await expectElementExist(getGridFileSelector(fileName), false, 5000);
await openContextEntryMenu(
getGridFileSelector('empty_folder'),
diff --git a/tests/e2e/search.helpers.js b/tests/e2e/search.helpers.js
index 4292113af..d9f4512d4 100644
--- a/tests/e2e/search.helpers.js
+++ b/tests/e2e/search.helpers.js
@@ -29,9 +29,10 @@ export async function addSearchCommand(
executeSearch = true,
forceOpenMenu = false,
) {
- if (!(await isDisplayed('#textQuery'))) {
+ if (await isDisplayed('#textQuery', false, 2000)) {
await clickOn('[data-tid=toggleSearch]');
}
+ await expectElementExist('#textQuery', true, 3000);
await typeInputValue('#textQuery', command);
if (!findAction(command, true)) {
await global.client.keyboard.press('Enter');