yarn format

sumomomomomo · sumomomomomo · commit 6b06445a361e · 2024-03-29T18:35:35.000+08:00
diff --git a/src/commons/controlBar/ControlBarToggleFolderModeButton.tsx b/src/commons/controlBar/ControlBarToggleFolderModeButton.tsx
@@ -32,7 +32,7 @@ export const ControlBarToggleFolderModeButton: React.FC<Props> = ({
           iconColor: isFolderModeEnabled ? Colors.BLUE4 : undefined
         }}
         onClick={toggleFolderMode}
-        isDisabled={isSessionActive || false && isPersistenceActive}
+        isDisabled={isSessionActive || isPersistenceActive}
       />
     </Tooltip2>
   );
diff --git a/src/commons/fileSystem/FileSystemActions.ts b/src/commons/fileSystem/FileSystemActions.ts
@@ -1,17 +1,16 @@
 import { createAction } from '@reduxjs/toolkit';
-import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
 import { FSModule } from 'browserfs/dist/node/core/FS';
+import { GitHubSaveInfo } from 'src/features/github/GitHubTypes';
+import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
 import { 
   ADD_GITHUB_SAVE_INFO,
-  DELETE_ALL_GITHUB_SAVE_INFO,
-  DELETE_GITHUB_SAVE_INFO,
-  SET_IN_BROWSER_FILE_SYSTEM,
-  UPDATE_GITHUB_SAVE_INFO,
   ADD_PERSISTENCE_FILE,
+  DELETE_ALL_GITHUB_SAVE_INFO,
+  DELETE_ALL_PERSISTENCE_FILES,  DELETE_GITHUB_SAVE_INFO,
   DELETE_PERSISTENCE_FILE, 
-  DELETE_ALL_PERSISTENCE_FILES } from './FileSystemTypes';
-import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
+  SET_IN_BROWSER_FILE_SYSTEM,
+  UPDATE_GITHUB_SAVE_INFO } from './FileSystemTypes';
 
 export const setInBrowserFileSystem = createAction(
   SET_IN_BROWSER_FILE_SYSTEM,
diff --git a/src/commons/fileSystem/FileSystemReducer.ts b/src/commons/fileSystem/FileSystemReducer.ts
@@ -4,13 +4,12 @@ import { Reducer } from 'redux';
 import { defaultFileSystem } from '../application/ApplicationTypes';
 import { SourceActionType } from '../utils/ActionsHelper';
 import { 
-  setInBrowserFileSystem,
   addGithubSaveInfo,
-  deleteAllGithubSaveInfo,
-  deleteGithubSaveInfo,
   addPersistenceFile,
+  deleteAllGithubSaveInfo,
+  deleteAllPersistenceFiles,  deleteGithubSaveInfo,
   deletePersistenceFile,
-  deleteAllPersistenceFiles } from './FileSystemActions';
+  setInBrowserFileSystem } from './FileSystemActions';
 import { FileSystemState } from './FileSystemTypes';
 
 export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = createReducer(
@@ -25,7 +24,7 @@ export const FileSystemReducer: Reducer<FileSystemState, SourceActionType> = cre
         const githubSaveInfoArray = state['githubSaveInfoArray']
 
         const saveInfoIndex = githubSaveInfoArray.findIndex(e => e === githubSaveInfoPayload);
-        if (saveInfoIndex == -1) {
+        if (saveInfoIndex === -1) {
           githubSaveInfoArray[githubSaveInfoArray.length] = githubSaveInfoPayload;
         } else {
           // file already exists, to replace file
diff --git a/src/commons/fileSystemView/FileSystemViewDirectoryNode.tsx b/src/commons/fileSystemView/FileSystemViewDirectoryNode.tsx
@@ -4,6 +4,7 @@ import { FSModule } from 'browserfs/dist/node/core/FS';
 import path from 'path';
 import React from 'react';
 import { useDispatch } from 'react-redux';
+import { persistenceCreateFile, persistenceCreateFolder, persistenceDeleteFolder } from 'src/features/persistence/PersistenceActions';
 import classes from 'src/styles/FileSystemView.module.scss';
 
 import { rmdirRecursively } from '../fileSystem/FileSystemUtils';
@@ -15,7 +16,6 @@ import FileSystemViewFileName from './FileSystemViewFileName';
 import FileSystemViewIndentationPadding from './FileSystemViewIndentationPadding';
 import FileSystemViewList from './FileSystemViewList';
 import FileSystemViewPlaceholderNode from './FileSystemViewPlaceholderNode';
-import { persistenceCreateFile, persistenceCreateFolder, persistenceDeleteFolder } from 'src/features/persistence/PersistenceActions';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
diff --git a/src/commons/fileSystemView/FileSystemViewFileName.tsx b/src/commons/fileSystemView/FileSystemViewFileName.tsx
@@ -2,6 +2,7 @@ import { FSModule } from 'browserfs/dist/node/core/FS';
 import path from 'path';
 import React from 'react';
 import { useDispatch } from 'react-redux';
+import { persistenceRenameFile, persistenceRenameFolder } from 'src/features/persistence/PersistenceActions';
 import classes from 'src/styles/FileSystemView.module.scss';
 
 import { showSimpleErrorDialog } from '../utils/DialogHelper';
@@ -10,7 +11,6 @@ import {
   renameEditorTabsForDirectory
 } from '../workspace/WorkspaceActions';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
-import { persistenceRenameFile, persistenceRenameFolder } from 'src/features/persistence/PersistenceActions';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
diff --git a/src/commons/fileSystemView/FileSystemViewFileNode.tsx b/src/commons/fileSystemView/FileSystemViewFileNode.tsx
@@ -4,6 +4,7 @@ import { FSModule } from 'browserfs/dist/node/core/FS';
 import path from 'path';
 import React from 'react';
 import { useDispatch, useStore } from 'react-redux';
+import { persistenceDeleteFile } from 'src/features/persistence/PersistenceActions';
 import classes from 'src/styles/FileSystemView.module.scss';
 
 import { OverallState } from '../application/ApplicationTypes';
@@ -13,7 +14,6 @@ import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
 import FileSystemViewContextMenu from './FileSystemViewContextMenu';
 import FileSystemViewFileName from './FileSystemViewFileName';
 import FileSystemViewIndentationPadding from './FileSystemViewIndentationPadding';
-import { persistenceDeleteFile } from 'src/features/persistence/PersistenceActions';
 
 type Props = {
   workspaceLocation: WorkspaceLocation;
diff --git a/src/commons/sagas/GitHubPersistenceSaga.ts b/src/commons/sagas/GitHubPersistenceSaga.ts
@@ -2,6 +2,7 @@ import {
   GetResponseDataTypeFromEndpointMethod,
   GetResponseTypeFromEndpointMethod
 } from '@octokit/types';
+import { FSModule } from 'browserfs/dist/node/core/FS';
 import { SagaIterator } from 'redux-saga';
 import { call, put, select, takeLatest } from 'redux-saga/effects';
 
@@ -24,7 +25,6 @@ import Constants from '../utils/Constants';
 import { promisifyDialog } from '../utils/DialogHelper';
 import { showSuccessMessage } from '../utils/notifications/NotificationsHelper';
 import { EditorTabState } from '../workspace/WorkspaceTypes';
-import { FSModule } from 'browserfs/dist/node/core/FS';
 
 export function* GitHubPersistenceSaga(): SagaIterator {
   yield takeLatest(LOGIN_GITHUB, githubLoginSaga);
diff --git a/src/commons/sagas/PersistenceSaga.tsx b/src/commons/sagas/PersistenceSaga.tsx
@@ -769,7 +769,7 @@ async function getFilesOfFolder( // recursively get files
   let fileList: gapi.client.drive.File[] | undefined;
   
   await gapi.client.drive.files.list({
-    q: '\'' + folderId + '\'' + ' in parents and trashed = false',
+    q: `'${folderId}' in parents and trashed = false`
   }).then(res => {
     fileList = res.result.files
   });
@@ -858,8 +858,8 @@ async function getContainingFolderIdRecursively( // TODO memoize?
   let folderList: gapi.client.drive.File[] | undefined;
 
   await gapi.client.drive.files.list({
-    q: '\'' + immediateParentFolderId + '\'' + ' in parents and trashed = false and mimeType = \''
-       + "application/vnd.google-apps.folder" + '\'',
+    q: `'${immediateParentFolderId}' in parents and trashed = false and mimeType = '`
+       + 'application/vnd.google-apps.folder\''
   }).then(res => {
     folderList = res.result.files
   });
diff --git a/src/features/github/GitHubActions.ts b/src/features/github/GitHubActions.ts
@@ -1,6 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import { GITHUB_OPEN_FILE, GITHUB_SAVE_FILE, GITHUB_SAVE_FILE_AS, GITHUB_SAVE_ALL } from './GitHubTypes';
+import { GITHUB_OPEN_FILE, GITHUB_SAVE_ALL,GITHUB_SAVE_FILE, GITHUB_SAVE_FILE_AS } from './GitHubTypes';
 
 export const githubOpenFile = createAction(GITHUB_OPEN_FILE, () => ({ payload: {} }));
 
diff --git a/src/features/github/GitHubUtils.tsx b/src/features/github/GitHubUtils.tsx
@@ -1,5 +1,4 @@
 import { Octokit } from '@octokit/rest';
-
 import {
   GetResponseDataTypeFromEndpointMethod,
   GetResponseTypeFromEndpointMethod
diff --git a/src/features/persistence/PersistenceActions.ts b/src/features/persistence/PersistenceActions.ts
@@ -1,17 +1,17 @@
 import { createAction } from '@reduxjs/toolkit';
 
 import {
-  PERSISTENCE_INITIALISE,
-  PERSISTENCE_OPEN_PICKER,
-  PERSISTENCE_SAVE_ALL,
-  PERSISTENCE_SAVE_FILE,
-  PERSISTENCE_SAVE_FILE_AS,
   PERSISTENCE_CREATE_FILE,
   PERSISTENCE_CREATE_FOLDER,
   PERSISTENCE_DELETE_FILE,
   PERSISTENCE_DELETE_FOLDER,
+  PERSISTENCE_INITIALISE,
+  PERSISTENCE_OPEN_PICKER,
   PERSISTENCE_RENAME_FILE,
   PERSISTENCE_RENAME_FOLDER,
+  PERSISTENCE_SAVE_ALL,
+  PERSISTENCE_SAVE_FILE,
+  PERSISTENCE_SAVE_FILE_AS,
   PersistenceFile
 } from './PersistenceTypes';
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { Octokit } from '@octokit/rest';`
`2`		`-`
`3`	`2`	`import {`
`4`	`3`	`GetResponseDataTypeFromEndpointMethod,`
`5`	`4`	`GetResponseTypeFromEndpointMethod`