Merge pull request #957 from ente-io/fix-testing-reported-issues
Fix testing reported issues
This commit is contained in:
commit
47dc6d15e5
|
@ -58,7 +58,7 @@ interface Props {
|
|||
) => void;
|
||||
selected: SelectedState;
|
||||
isFirstLoad?;
|
||||
hasPersonalFiles?;
|
||||
hasNoPersonalFiles?;
|
||||
openUploader?;
|
||||
isInSearchMode?: boolean;
|
||||
search?: Search;
|
||||
|
@ -80,7 +80,7 @@ const PhotoFrame = ({
|
|||
setSelected,
|
||||
selected,
|
||||
isFirstLoad,
|
||||
hasPersonalFiles,
|
||||
hasNoPersonalFiles,
|
||||
openUploader,
|
||||
isInSearchMode,
|
||||
search,
|
||||
|
@ -655,7 +655,7 @@ const PhotoFrame = ({
|
|||
return (
|
||||
<>
|
||||
{!isFirstLoad &&
|
||||
!hasPersonalFiles &&
|
||||
hasNoPersonalFiles &&
|
||||
!isInSearchMode &&
|
||||
activeCollection === ALL_SECTION ? (
|
||||
<EmptyScreen openUploader={openUploader} />
|
||||
|
|
|
@ -142,7 +142,7 @@ export default function Gallery() {
|
|||
|
||||
const [isFirstLoad, setIsFirstLoad] = useState(false);
|
||||
const [isFirstFetch, setIsFirstFetch] = useState(false);
|
||||
const [hasPersonalFiles, setHasPersonalFiles] = useState(false);
|
||||
const [hasNoPersonalFiles, setHasNoPersonalFiles] = useState(false);
|
||||
const [selected, setSelected] = useState<SelectedState>({
|
||||
ownCount: 0,
|
||||
count: 0,
|
||||
|
@ -393,11 +393,10 @@ export default function Gallery() {
|
|||
archivedCollections
|
||||
);
|
||||
setCollectionSummaries(collectionSummaries);
|
||||
const incomingShareFiles = files.filter(
|
||||
const hasNoPersonalFiles = files.every(
|
||||
(file) => file.ownerID !== user.id
|
||||
);
|
||||
const hasPersonalFiles = files.length - incomingShareFiles.length > 0;
|
||||
setHasPersonalFiles(hasPersonalFiles);
|
||||
setHasNoPersonalFiles(hasNoPersonalFiles);
|
||||
};
|
||||
|
||||
const clearSelection = function () {
|
||||
|
@ -709,7 +708,7 @@ export default function Gallery() {
|
|||
setSelected={setSelected}
|
||||
selected={selected}
|
||||
isFirstLoad={isFirstLoad}
|
||||
hasPersonalFiles={hasPersonalFiles}
|
||||
hasNoPersonalFiles={hasNoPersonalFiles}
|
||||
openUploader={openUploader}
|
||||
isInSearchMode={isInSearchMode}
|
||||
search={search}
|
||||
|
|
|
@ -255,6 +255,7 @@ export const getCollection = async (
|
|||
};
|
||||
|
||||
export const getCollectionLatestFiles = (
|
||||
user: User,
|
||||
files: EnteFile[],
|
||||
archivedCollections: Set<number>
|
||||
): CollectionLatestFiles => {
|
||||
|
@ -274,6 +275,7 @@ export const getCollectionLatestFiles = (
|
|||
!latestFiles.has(ALL_SECTION) &&
|
||||
!IsArchived(file) &&
|
||||
!file.isTrashed &&
|
||||
file.ownerID === user.id &&
|
||||
!archivedCollections.has(file.collectionID)
|
||||
) {
|
||||
latestFiles.set(ALL_SECTION, file);
|
||||
|
@ -943,6 +945,7 @@ export async function getCollectionSummaries(
|
|||
): Promise<CollectionSummaries> {
|
||||
const collectionSummaries: CollectionSummaries = new Map();
|
||||
const collectionLatestFiles = getCollectionLatestFiles(
|
||||
user,
|
||||
files,
|
||||
archivedCollections
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue