post-PR fixes: formatting && m

vorpal-research · Dec 3, 2020 · 341f59d · 341f59d
1 parent 9daf712
commit 341f59d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/kotoed-js/src/main/ts/code/actions.ts b/kotoed-js/src/main/ts/code/actions.ts
@@ -211,7 +211,9 @@ export function loadLostFound(payload: SubmissionPayload) {
 }
 
 // Lower numbers are displayed first
-const fileTypeDisplayOrder = Map<FileType, number>({"directory": 1, "file": 2})
+const fileTypeDisplayOrder = {directory: 1, file: 2}
+const naturalSorter = natsort()
+const typeSorter = (a: File, b: File) => fileTypeDisplayOrder[a.type] - fileTypeDisplayOrder[b.type]
 
 export function fetchRootDirIfNeeded(payload: SubmissionPayload) {
     return (dispatch: Dispatch<CodeReviewState>, getState: () => CodeReviewState) => {
@@ -223,9 +225,6 @@ export function fetchRootDirIfNeeded(payload: SubmissionPayload) {
         }));
 
         return fetchRootDir(payload.submissionId).then((root) => {
-            const naturalSorter = natsort()
-            const typeSorter = (a: File, b: File) =>
-                fileTypeDisplayOrder.get(a.type) - fileTypeDisplayOrder.get(b.type)
             const recursiveSorter = (node: File) => {
                 if (node.children == null) {
                     return

diff --git a/kotoed-js/src/main/ts/projects/list.tsx b/kotoed-js/src/main/ts/projects/list.tsx
@@ -230,16 +230,14 @@ class ProjectsSearch extends React.Component<{}, ProjectSearchState> {
     tagCloug = (cb: SearchCallback) => {
         return this.state.tags.length !== 0 && <Row>
             <Col xs={12} sm={12} md={12} lg={12}>
-                {intersperse<JSX.Element | string>(this.state.tags.map(tag => <TagComponent key={tag.id} tag={tag}
-                                                                                            removable={false}
-                                                                                            onClick={() => {
-                                                                                                const searchState = cb();
-                                                                                                // XXX: we can do better
-                                                                                                // XXX: also it's a copy-paste from ProjectComponent
-                                                                                                if (!searchState.oldKey.includes(tag.name)) {
-                                                                                                    searchState.toggleSearch(searchState.oldKey + " " + tag.name)
-                                                                                                }
-                                                                                            }}/>), " ")}
+                {intersperse<JSX.Element | string>(this.state.tags.map(tag => <TagComponent key={tag.id} tag={tag} removable={false} onClick={() => {
+                    const searchState = cb();
+                    // XXX: we can do better
+                    // XXX: also it's a copy-paste from ProjectComponent
+                    if(!searchState.oldKey.includes(tag.name)) {
+                        searchState.toggleSearch(searchState.oldKey + " " + tag.name)
+                    }
+                }}/>), " ")}
             </Col>
         </Row>;
     };
@@ -269,16 +267,16 @@ class ProjectsSearch extends React.Component<{}, ProjectSearchState> {
         return (
             <Table striped bordered condensed hover responsive>
                 <thead>
-                <tr>
-                    <th className="col-md-1">Id</th>
-                    <th className="col-md-2">Name</th>
-                    <th className="col-md-3">Author</th>
-                    <th className="col-md-1">Repo</th>
-                    <th className="col-md-5">Open submissions</th>
-                </tr>
+                    <tr>
+                        <th className="col-md-1">Id</th>
+                        <th className="col-md-2">Name</th>
+                        <th className="col-md-3">Author</th>
+                        <th className="col-md-1">Repo</th>
+                        <th className="col-md-5">Open submissions</th>
+                    </tr>
                 </thead>
                 <tbody>
-                {children}
+                    {children}
                 </tbody>
             </Table>)
     };