beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #957 from ente-io/fix-testing-reported-issues

Browse source 
Fix testing reported issues
This commit is contained in:
Abhinav Kumar 2023-02-24 16:32:26 +05:30 committed by GitHub
parent b52583998f 95e8579066
commit 47dc6d15e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/PhotoFrame.tsx
View file

@ -58,7 +58,7 @@ interface Props {
) => void; ) => void;
selected: SelectedState; selected: SelectedState;
isFirstLoad?; isFirstLoad?;
hasPersonalFiles?; hasNoPersonalFiles?;
openUploader?; openUploader?;
isInSearchMode?: boolean; isInSearchMode?: boolean;
search?: Search; search?: Search;
@ -80,7 +80,7 @@ const PhotoFrame = ({
setSelected, setSelected,
selected, selected,
isFirstLoad, isFirstLoad,
hasPersonalFiles, hasNoPersonalFiles,
openUploader, openUploader,
isInSearchMode, isInSearchMode,
search, search,
@ -655,7 +655,7 @@ const PhotoFrame = ({
return ( return (
<> <>
{!isFirstLoad && {!isFirstLoad &&
!hasPersonalFiles && hasNoPersonalFiles &&
!isInSearchMode && !isInSearchMode &&
activeCollection === ALL_SECTION ? ( activeCollection === ALL_SECTION ? (
<EmptyScreen openUploader={openUploader} /> <EmptyScreen openUploader={openUploader} />

9
src/pages/gallery/index.tsx
View file

@ -142,7 +142,7 @@ export default function Gallery() {
const [isFirstLoad, setIsFirstLoad] = useState(false); const [isFirstLoad, setIsFirstLoad] = useState(false);
const [isFirstFetch, setIsFirstFetch] = useState(false); const [isFirstFetch, setIsFirstFetch] = useState(false);
const [hasPersonalFiles, setHasPersonalFiles] = useState(false); const [hasNoPersonalFiles, setHasNoPersonalFiles] = useState(false);
const [selected, setSelected] = useState<SelectedState>({ const [selected, setSelected] = useState<SelectedState>({
ownCount: 0, ownCount: 0,
count: 0, count: 0,
@ -393,11 +393,10 @@ export default function Gallery() {
archivedCollections archivedCollections
); );
setCollectionSummaries(collectionSummaries); setCollectionSummaries(collectionSummaries);
const incomingShareFiles = files.filter( const hasNoPersonalFiles = files.every(
(file) => file.ownerID !== user.id (file) => file.ownerID !== user.id
); );
const hasPersonalFiles = files.length - incomingShareFiles.length > 0; setHasNoPersonalFiles(hasNoPersonalFiles);
setHasPersonalFiles(hasPersonalFiles);
}; };
const clearSelection = function () { const clearSelection = function () {
@ -709,7 +708,7 @@ export default function Gallery() {
setSelected={setSelected} setSelected={setSelected}
selected={selected} selected={selected}
isFirstLoad={isFirstLoad} isFirstLoad={isFirstLoad}
hasPersonalFiles={hasPersonalFiles} hasNoPersonalFiles={hasNoPersonalFiles}
openUploader={openUploader} openUploader={openUploader}
isInSearchMode={isInSearchMode} isInSearchMode={isInSearchMode}
search={search} search={search}

3
src/services/collectionService.ts
View file

@ -255,6 +255,7 @@ export const getCollection = async (
}; };
export const getCollectionLatestFiles = ( export const getCollectionLatestFiles = (
user: User,
files: EnteFile[], files: EnteFile[],
archivedCollections: Set<number> archivedCollections: Set<number>
): CollectionLatestFiles => { ): CollectionLatestFiles => {
@ -274,6 +275,7 @@ export const getCollectionLatestFiles = (
!latestFiles.has(ALL_SECTION) && !latestFiles.has(ALL_SECTION) &&
!IsArchived(file) && !IsArchived(file) &&
!file.isTrashed && !file.isTrashed &&
file.ownerID === user.id &&
!archivedCollections.has(file.collectionID) !archivedCollections.has(file.collectionID)
) { ) {
latestFiles.set(ALL_SECTION, file); latestFiles.set(ALL_SECTION, file);
@ -943,6 +945,7 @@ export async function getCollectionSummaries(
): Promise<CollectionSummaries> { ): Promise<CollectionSummaries> {
const collectionSummaries: CollectionSummaries = new Map(); const collectionSummaries: CollectionSummaries = new Map();
const collectionLatestFiles = getCollectionLatestFiles( const collectionLatestFiles = getCollectionLatestFiles(
user,
files, files,
archivedCollections archivedCollections
); );