Merge branch 'master' into upload-refactoring

src/components/pages/gallery/UploadProgress.tsx

@@ -53,6 +53,7 @@ const FileList = styled.ul`
 `;
 
 const SectionTitle = styled.div`
+    margin-top: 10px;
     display: flex;
     justify-content: space-between;
     padding: 0 20px;
@@ -65,7 +66,7 @@ interface ResultSectionProps {
     fileUploadResultMap: Map<FileUploadResults, string[]>;
     fileUploadResult: FileUploadResults;
     sectionTitle;
-    sectionInfo;
+    sectionInfo?: any;
     infoHeight: number;
 }
 const ResultSection = (props: ResultSectionProps) => {
@@ -84,7 +85,7 @@ const ResultSection = (props: ResultSectionProps) => {
             <Content
                 collapsed={!listView}
                 height={fileList.length * 33 + props.infoHeight}>
-                <p>{props.sectionInfo}</p>
+                {props.sectionInfo && <p>{props.sectionInfo}</p>}
                 <FileList>
                     {fileList.map((fileName) => (
                         <li key={fileName}>{fileName}</li>
@@ -95,6 +96,39 @@ const ResultSection = (props: ResultSectionProps) => {
     );
 };
 
+interface InProgressProps {
+    sectionTitle: string;
+    fileProgressStatuses: FileProgresses[];
+}
+const InProgressSection = (props: InProgressProps) => {
+    const [listView, setListView] = useState(true);
+    const fileList = props.fileProgressStatuses;
+    if (!fileList?.length) {
+        return <></>;
+    }
+    if (!fileList?.length) {
+        return <></>;
+    }
+    return (
+        <>
+            <SectionTitle onClick={() => setListView(!listView)}>
+                {' '}
+                {props.sectionTitle}{' '}
+                {listView ? <ExpandLess /> : <ExpandMore />}
+            </SectionTitle>
+            <Content collapsed={!listView} height={fileList.length * 35}>
+                <FileList>
+                    {fileList.map(({ fileName, progress }) => (
+                        <li key={fileName} style={{ marginTop: '12px' }}>
+                            {constants.FILE_UPLOAD_PROGRESS(fileName, progress)}
+                        </li>
+                    ))}
+                </FileList>
+            </Content>
+        </>
+    );
+};
+
 export default function UploadProgress(props: Props) {
     const fileProgressStatuses = [] as FileProgresses[];
     const fileUploadResultMap = new Map<FileUploadResults, string[]>();
@@ -155,26 +189,15 @@ export default function UploadProgress(props: Props) {
                         variant="upload-progress-bar"
                     />
                 )}
-                {fileProgressStatuses.length > 0 && (
+                <InProgressSection
-                    <FileList>
+                    fileProgressStatuses={fileProgressStatuses}
-                        {fileProgressStatuses.map(({ fileName, progress }) => (
+                    sectionTitle={constants.INPROGRESS_UPLOADS}
-                            <li key={fileName} style={{ marginTop: '12px' }}>
+                />
-                                {props.uploadStage === UPLOAD_STAGES.FINISH
-                                    ? fileName
-                                    : constants.FILE_UPLOAD_PROGRESS(
-                                          fileName,
-                                          progress
-                                      )}
-                            </li>
-                        ))}
-                    </FileList>
-                )}
 
                 <ResultSection
                     fileUploadResultMap={fileUploadResultMap}
                     fileUploadResult={FileUploadResults.UPLOADED}
                     sectionTitle={constants.SUCCESSFUL_UPLOADS}
-                    sectionInfo={constants.SUCCESS_INFO}
                     infoHeight={32}
                 />
 

src/pages/credentials/index.tsx

@@ -31,7 +31,7 @@ export default function Credentials() {
         const key = getKey(SESSION_KEYS.ENCRYPTION_KEY);
         if (
             (!user?.token && !user?.encryptedToken) ||
-            !keyAttributes?.memLimit
+            (keyAttributes && !keyAttributes.memLimit)
         ) {
             clearData();
             router.push('/');

src/pages/verify/index.tsx

@@ -13,12 +13,14 @@ import {
     logoutUser,
     clearFiles,
     EmailVerificationResponse,
+    User,
 } from 'services/userService';
 import { setIsFirstLogin } from 'utils/storage';
 import SubmitButton from 'components/SubmitButton';
 import { clearKeys } from 'utils/storage/sessionStorage';
 import { AppContext } from 'pages/_app';
 import LogoImg from 'components/LogoImg';
+import { KeyAttributes } from 'types';
 
 interface formValues {
     ott: string;
@@ -36,9 +38,14 @@ export default function Verify() {
             router.prefetch('/twoFactor/verify');
             router.prefetch('/credentials');
             router.prefetch('/generate');
-            const user = getData(LS_KEYS.USER);
+            const user: User = getData(LS_KEYS.USER);
+            const keyAttributes: KeyAttributes = getData(
+                LS_KEYS.KEY_ATTRIBUTES
+            );
             if (!user?.email) {
                 router.push('/');
+            } else if (keyAttributes.encryptedKey) {
+                router.push('credentials');
             } else {
                 setEmail(user.email);
             }
@@ -71,7 +78,6 @@ export default function Verify() {
                 router.push('/two-factor/verify');
             } else {
                 setData(LS_KEYS.USER, {
-                    ...getData(LS_KEYS.USER),
                     email,
                     token,
                     encryptedToken,

src/utils/strings/englishConstants.tsx

@@ -498,8 +498,8 @@ const englishConstants = {
         ' unable to upload these files because of network issue, you can retry upload these files',
     SKIPPED_INFO: 'these files already existed in the album',
     UNSUPPORTED_INFO: 'these files are currently not supported by ente',
-    SUCCESS_INFO: 'successfully backed-up memories',
     BLOCKED_UPLOADS: 'blocked uploads',
+    INPROGRESS_UPLOADS: 'upload in progress',
 };
 
 export default englishConstants;