handle variant urls

Author: arsalan0c

src/components/Application.tsx

@@ -16,19 +16,26 @@ import Contributors from './contributors';
 import NavigationBar from './NavigationBar';
 import NotFound from './NotFound';
 
+import { Variant } from 'js-slang/dist/types';
+
 export interface IApplicationProps extends IDispatchProps, IStateProps, RouteComponentProps<{}> {}
 
 export interface IStateProps {
   accessToken?: string;
   currentPlaygroundChapter: number;
+  currentPlaygroundVariant: Variant;
   role?: Role;
   title: string;
   name?: string;
   currentExternalLibrary: ExternalLibraryName;
 }
 
 export interface IDispatchProps {
-  handleClearContext: (chapter: number, externalLibraryName: ExternalLibraryName) => void;
+  handleClearContext: (
+    chapter: number,
+    variant: Variant,
+    externalLibraryName: ExternalLibraryName
+  ) => void;
   handleEditorValueChange: (val: string) => void;
   handleEditorUpdateBreakpoints: (breakpoints: string[]) => void;
   handleEnsureLibrariesLoaded: () => void;
@@ -90,12 +97,13 @@ const toLogin = (props: IApplicationProps) => () => (
 const parsePlayground = (props: IApplicationProps) => {
   const prgrm = parsePrgrm(props);
   const chapter = parseChapter(props) || props.currentPlaygroundChapter;
+  const variant = parseVariant(props) || props.currentPlaygroundVariant;
   const externalLibraryName = parseExternalLibrary(props) || props.currentExternalLibrary;
   const execTime = parseExecTime(props);
   if (prgrm) {
     props.handleEditorValueChange(prgrm);
     props.handleEnsureLibrariesLoaded();
-    props.handleClearContext(chapter, externalLibraryName);
+    props.handleClearContext(chapter, variant, externalLibraryName);
     props.handleExternalLibrarySelect(externalLibraryName);
     props.handleSetExecTime(execTime);
   }
@@ -112,13 +120,24 @@ const parsePrgrm = (props: RouteComponentProps<{}>) => {
 
 const parseChapter = (props: RouteComponentProps<{}>) => {
   const chapQuery = qs.parse(props.location.hash).chap;
+
   const chap: number = sourceURLNames.has(chapQuery)
-    ? sourceURLNames.get(chapQuery)!
+    ? sourceURLNames.get(chapQuery)!.chapter
     : chapQuery === undefined
     ? NaN
     : parseInt(chapQuery, 10);
 
-  return chap;
+  return chap ? chap : undefined;
+};
+
+const parseVariant = (props: RouteComponentProps<{}>) => {
+  const chapQuery = qs.parse(props.location.hash).chap;
+
+  const variant: Variant = sourceURLNames.has(chapQuery)
+    ? sourceURLNames.get(chapQuery)!.variant
+    : 'default';
+
+  return variant;
 };
 
 const parseExternalLibrary = (props: RouteComponentProps<{}>) => {

src/components/__tests__/Application.tsx

@@ -5,14 +5,21 @@ import { mockRouterProps } from '../../mocks/components';
 import Application, { IApplicationProps } from '../Application';
 import { ExternalLibraryName, ExternalLibraryNames } from '../assessment/assessmentShape';
 
+import { Variant } from 'js-slang/dist/types';
+
 test('Application renders correctly', () => {
   const props: IApplicationProps = {
     ...mockRouterProps('/academy', {}),
     title: 'Cadet',
     currentPlaygroundChapter: 2,
+    currentPlaygroundVariant: 'default',
     handleLogOut: () => {},
     currentExternalLibrary: ExternalLibraryNames.NONE,
-    handleClearContext: (chapter: number, externalLibraryName: ExternalLibraryName) => {},
+    handleClearContext: (
+      chapter: number,
+      variant: Variant,
+      externalLibraryName: ExternalLibraryName
+    ) => {},
     handleEditorValueChange: (val: string) => {},
     handleEditorUpdateBreakpoints: (breakpoints: string[]) => {},
     handleEnsureLibrariesLoaded: () => {},

src/components/assessment/assessmentShape.ts

@@ -164,6 +164,8 @@ type ExternalLibrary = {
   symbols: string[];
 };
 
+export type Variant = 'lazy' | 'non-det' | 'default'
+
 export type Library = {
   chapter: number;
   variant?: Variant;

src/components/missionControl/editingWorkspaceSideContent/DeploymentTab.tsx

@@ -3,7 +3,7 @@ import { IconNames } from '@blueprintjs/icons';
 import { ItemRenderer, Select } from '@blueprintjs/select';
 import * as React from 'react';
 import { externalLibraries } from '../../../reducers/externalLibraries';
-import { sourceLanguages, styliseChapter  } from '../../../reducers/states';
+import { sourceLanguages, styliseChapter } from '../../../reducers/states';
 
 import { ExternalLibraryName, IAssessment, Library } from '../../assessment/assessmentShape';
 import { controlButton } from '../../commons';
@@ -242,7 +242,11 @@ const altEval = (str: string): any => {
   return Function('"use strict";return (' + str + ')')();
 };
 
-const chapters = sourceLanguages.map(lang => ({ chapter: lang.chapter, variant: lang.variant, displayName: styliseChapter(lang.chapter, lang.variant) }));
+const chapters = sourceLanguages.map(lang => ({
+  chapter: lang.chapter,
+  variant: lang.variant,
+  displayName: styliseChapter(lang.chapter, lang.variant)
+}));
 
 const chapterSelect = (
   currentChap: number,

src/containers/ApplicationContainer.ts

@@ -13,6 +13,8 @@ import { ExternalLibraryName } from '../components/assessment/assessmentShape';
 import { externalLibraries } from '../reducers/externalLibraries';
 import { IState } from '../reducers/states';
 
+import { Variant } from 'js-slang/dist/types';
+
 /**
  * Provides the title of the application for display.
  * An object with the relevant properties must be
@@ -26,6 +28,7 @@ const mapStateToProps: MapStateToProps<IStateProps, {}, IState> = state => ({
   role: state.session.role,
   name: state.session.name,
   currentPlaygroundChapter: state.workspaces.playground.context.chapter,
+  currentPlaygroundVariant: state.workspaces.playground.context.variant,
   currentExternalLibrary: state.workspaces.playground.externalLibrary
 });
 
@@ -34,10 +37,15 @@ const workspaceLocation = WorkspaceLocations.playground;
 const mapDispatchToProps: MapDispatchToProps<IDispatchProps, {}> = (dispatch: Dispatch<any>) =>
   bindActionCreators(
     {
-      handleClearContext: (chapter: number, externalLibraryName: ExternalLibraryName) =>
+      handleClearContext: (
+        chapter: number,
+        variant: Variant,
+        externalLibraryName: ExternalLibraryName
+      ) =>
         beginClearContext(
           {
             chapter,
+            variant,
             external: {
               name: externalLibraryName,
               symbols: externalLibraries.get(externalLibraryName)!