Files: отображать загружаемые файлы сразу

Author: DedSec256

hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx

@@ -461,13 +461,13 @@ const CourseHomeworkExperimental: FC<{
         <Typography component="div" style={{color: "#454545"}} gutterBottom variant="body1">
             <MarkdownPreview value={homework.description!}/>
         </Typography>
-        {props.isProcessing ? (
-            <div style={{display: 'flex', alignItems: 'center', color: '#1976d2', fontWeight: '500'}}>
-                <CircularProgress size="20px"/>
-                &nbsp;&nbsp;Обрабатываем файлы...
-            </div>
-        ) : filesInfo.length > 0 && (
+        {filesInfo.length > 0 && (
             <div>
+                {props.isProcessing &&
+                    <div style={{display: 'flex', alignItems: 'center', color: '#1976d2', fontWeight: '500'}}>
+                        <CircularProgress size="20px"/>
+                        &nbsp;&nbsp;Обрабатываем файлы...
+                    </div>}
                 <FilesPreviewList
                     showOkStatus={props.isMentor}
                     filesInfo={filesInfo}

hwproj.front/src/components/Solutions/TaskSolutionComponent.tsx

@@ -1063,31 +1063,34 @@ const TaskSolutionComponent: FC<ISolutionProps> = (props) => {
                         </Grid>
                     </Stack>
                 </Grid>
-            <Grid item spacing={8}>
-                {solution.comment &&
-                    <Grid item style={{marginBottom: -10}} spacing={4}>
-                        {showOriginalCommentText
-                            ? <Typography
-                                style={{marginBottom: 15, whiteSpace: 'break-spaces'}}>{solution.comment}</Typography>
-                            : <MarkdownPreview value={solution.comment}/>}
-                    </Grid>
-                }
-                {props.isProcessing ? (
-                    <div style={{ display: 'flex', alignItems: 'center', color: '#1976d2', fontWeight: '500' }}>
-                        <CircularProgress size="20px" />
-                        &nbsp;&nbsp;Обрабатываем файлы...
-                    </div>
-                ) : filesInfo.length > 0 && (
-                    <div>
-                        <FilesPreviewList
-                            showOkStatus={ !props.forMentor }
-                            filesInfo={filesInfo}
-                            onClickFileInfo={async (fileInfo: IFileInfo) => {
-                                const url = await ApiSingleton.customFilesApi.getDownloadFileLink(fileInfo.id!)
-                                window.open(url, '_blank');
-                            }}
-                        />
-                    </div>
+                <Grid item spacing={8}>
+                    {solution.comment &&
+                        <Grid item style={{marginBottom: -10}} spacing={4}>
+                            {showOriginalCommentText
+                                ? <Typography
+                                    style={{
+                                        marginBottom: 15,
+                                        whiteSpace: 'break-spaces'
+                                    }}>{solution.comment}</Typography>
+                                : <MarkdownPreview value={solution.comment}/>}
+                        </Grid>
+                    }
+                    {filesInfo.length > 0 && (
+                        <div>
+                            {props.isProcessing && <div
+                                style={{display: 'flex', alignItems: 'center', color: '#1976d2', fontWeight: '500'}}>
+                                <CircularProgress size="20px"/>
+                                &nbsp;&nbsp;Обрабатываем файлы...
+                            </div>}
+                            <FilesPreviewList
+                                showOkStatus={!props.forMentor}
+                                filesInfo={filesInfo}
+                                onClickFileInfo={async (fileInfo: IFileInfo) => {
+                                    const url = await ApiSingleton.customFilesApi.getDownloadFileLink(fileInfo.id!)
+                                    window.open(url, '_blank');
+                                }}
+                            />
+                        </div>
                     )}
                 </Grid>
             </Grid>