remove decoder oop and fix bugs

Author: Rachelcoll

src/commons/controlBar/ControlBarShareButton.tsx

@@ -22,7 +22,7 @@ type StateProps = {
   shortURL?: string;
   key: string;
   isSicp?: boolean;
-  programConfig: Partial<ShareLinkState>;
+  programConfig: ShareLinkState;
 };
 
 type State = {
@@ -39,6 +39,7 @@ export class ControlBarShareButton extends React.PureComponent<ControlBarShareBu
     this.selectShareInputText = this.selectShareInputText.bind(this);
     this.handleChange = this.handleChange.bind(this);
     this.toggleButton = this.toggleButton.bind(this);
+    this.fetchUUID = this.fetchUUID.bind(this);
     this.shareInputElem = React.createRef();
     this.state = { keyword: '', isLoading: false, isSuccess: false };
   }
@@ -53,7 +54,7 @@ export class ControlBarShareButton extends React.PureComponent<ControlBarShareBu
 
   handleKeyDown = (event: any) => {
     if (event.key === 'Enter' && event.ctrlKey) {
-      // console.log('Ctrl+Enter pressed!');
+      // press Ctrl+Enter to generate and copy new share link directly
       this.setState({ keyword: 'Test' });
       this.props.handleShortenURL(this.state.keyword);
       this.setState({ isLoading: true });
@@ -144,7 +145,6 @@ export class ControlBarShareButton extends React.PureComponent<ControlBarShareBu
     }
 
     // reset state
-    // this.props.handleUpdateShortURL('');
     this.setState({ keyword: '', isLoading: false, isSuccess: false });
   }
 
@@ -178,11 +178,11 @@ export class ControlBarShareButton extends React.PureComponent<ControlBarShareBu
       })
       .then(resp => {
         this.setState({
-          // seems like there's no frontend url env variavle, should be replaced by frontend server accordingly
+          // seems like there's no frontend url env variable, should be replaced by frontend server accordingly
           keyword: `http://localhost:8000/playground/share/` + resp.uuid
         });
         this.setState({ isLoading: true, isSuccess: true });
       })
-      .catch(err => showWarningMessage('fail to generate url!' + err));
+      .catch(err => showWarningMessage('Fail to generate url! Error: ' + err));
   }
 }

src/features/playground/shareLinks/ShareLinkState.tsx renamed to src/features/playground/shareLinks/ShareLinkState.ts

@@ -1,4 +1,4 @@
-type ShareLinkState = {
+type ShareLinkState = Partial<{
   isFolder: string;
   tabs: string;
   tabIdx: string;
@@ -8,6 +8,6 @@ type ShareLinkState = {
   exec: string;
   files: string;
   prgrm: string;
-};
+}>;
 
 export default ShareLinkState;

src/features/playground/shareLinks/decoder/Decoder.ts

@@ -11,7 +11,7 @@ class ShareLinkStateDecoder {
     this.encodedString = encodedString;
   }
 
-  decodeWith(decoderDelegate: DecoderDelegate): Partial<ShareLinkState> {
+  decodeWith(decoderDelegate: DecoderDelegate): ShareLinkState {
     return decoderDelegate.decode(this.encodedString);
   }
 }

src/features/playground/shareLinks/decoder/delegates/DecoderDelegate.ts

@@ -1,7 +1,7 @@
 import ShareLinkState from '../../ShareLinkState';
 
 interface DecoderDelegate {
-  decode(str: string): Partial<ShareLinkState>;
+  decode(str: string): ShareLinkState;
 }
 
 export default DecoderDelegate;

src/features/playground/shareLinks/decoder/delegates/JsonDecoderDelegate.ts

@@ -2,7 +2,7 @@ import ShareLinkState from '../../ShareLinkState';
 import DecoderDelegate from './DecoderDelegate';
 
 class JsonDecoderDelegate implements DecoderDelegate {
-  decode(str: string): Partial<ShareLinkState> {
+  decode(str: string): ShareLinkState {
     const jsonObject = JSON.parse(str);
     return jsonObject.data;
   }

src/features/playground/shareLinks/decoder/delegates/UrlParamsDecoderDelegate.ts

@@ -4,7 +4,7 @@ import ShareLinkState from '../../ShareLinkState';
 import DecoderDelegate from './DecoderDelegate';
 
 class UrlParamsDecoderDelegate implements DecoderDelegate {
-  decode(str: string): Partial<ShareLinkState> {
+  decode(str: string): ShareLinkState {
     const qs: Partial<IParsedQuery> = parseQuery(str);
     return {
       chap: qs.chap,

src/features/playground/shareLinks/encoder/Encoder.ts

@@ -8,7 +8,7 @@ import { EditorTabState } from 'src/commons/workspace/WorkspaceTypes';
 
 import ShareLinkState from '../ShareLinkState';
 
-export const useURLEncoder = () => {
+export const useUrlEncoder = () => {
   const isFolderModeEnabled = useTypedSelector(
     state => state.workspaces.playground.isFolderModeEnabled
   );
@@ -23,11 +23,11 @@ export const useURLEncoder = () => {
   const chapter = useTypedSelector(state => state.workspaces.playground.context.chapter);
   const variant = useTypedSelector(state => state.workspaces.playground.context.variant);
   const execTime = useTypedSelector(state => state.workspaces.playground.execTime);
-  const fileSystem = useGetFileSystem();
+  const files = useGetFile();
 
-  const result: Partial<ShareLinkState> = {
+  const result: ShareLinkState = {
     isFolder: isFolderModeEnabled.toString(),
-    files: useGetFile(fileSystem).toString(),
+    files: files.toString(),
     tabs: editorTabFilePaths.map(compressToEncodedURIComponent)[0],
     tabIdx: activeEditorTabIndex?.toString(),
     chap: chapter.toString(),
@@ -39,14 +39,10 @@ export const useURLEncoder = () => {
   return result;
 };
 
-const useGetFileSystem = () => {
+const useGetFile = () => {
   const fileSystem = useTypedSelector(state => state.fileSystem.inBrowserFileSystem);
-  return fileSystem as FSModule;
-};
-
-const useGetFile = (fileSystem: FSModule) => {
   const [files, setFiles] = useState<Record<string, string>>({});
-  retrieveFilesInWorkspaceAsRecord('playground', fileSystem).then(result => {
+  retrieveFilesInWorkspaceAsRecord('playground', fileSystem as FSModule).then(result => {
     setFiles(result);
   });
   return compressToEncodedURIComponent(qs.stringify(files));