Segregate Playground and Assessment Workspaces #137

remo5000 · 2018-06-26T11:38:05Z

Features

Playground and Assessment have separate Workspaces in the redux state
Workspace is now stateless (not connected)

TODO

The display function needs to pass in a location argument, to be kept in the Context
The Assessments Workspace does not allow editing of the Editor code (forced to be the solution template)
The slice of the state for the Assessment's workspace must get reset every time one switches away from the question (e.g when they go to the menu, or when they go to the next question)

I will add this back as an OwnProps property, passed by either Assessment or Playground

Added an additional parameter to denote the location of the action call.

Due to the workspace's input and dispatch being determined by the context, they can be passed in as props by Assessment or Playground.

Also fixed some errors picked up at compilation time.

For some reason the member-ordering linting does not pass despite proper(?) ordering. I'll open an issue for this.

This holds the 2 instances of IWorkspaceState, playground and assessment. I've also added a scaffold of how the reducer function would work, given a location. The location (type WorkspaceLocation) is now specified to correspond to the key of the IWorkspaceState within the IWorkspaceManagerState.

Also made some interpreter actions to include location

- Removed cached editorValue - Renamed IState.workspace into workspaces - Fixed a typo

Also added a missing handleChangeActiveTab

For some reason, the spread and rest operators did not work with the varying argument lengths. I proceeded to change them to a manual currying. Also fixed a bug with the argument type for handleEditorWidthChange.

ning-y · 2018-06-26T12:03:12Z

src/actions/interpreter.ts

  type: actionTypes.HANDLE_CONSOLE_LOG,
-  payload: log
+  payload: { log, workspaceLocation }


logString is more descriptive imo

ning-y · 2018-06-26T12:06:01Z

src/actions/workspace.ts

+ * Note that the names must correspond with the name of the
+ * object in IWorkspaceManagerState.
+ */
+export type WorkspaceLocation = 'assessment' | 'playground'


Can you use values from the enum instead of string literals?

ning-y · 2018-06-26T12:07:18Z

src/components/Playground.tsx

+  editorWidth: string
+  output: InterpreterOutput[]
+  replValue: string
+}


Quite a lot of properties here, I think they could be alphabeticalised

remo5000 · 2018-06-27T02:59:55Z

Thanks for the quick review, have applied the changes 👍. I'll start on the other features now.

This allows the "presetting" of values like in the case of a solutionTemplate. However, it also forces any component to provide such a value, thus I have added a template string for playground.

- For IStateProps, the properties I was assigning to were optional, meaning that the linting did not catch the error. I overcame this by storing and casting the return value. - Made a mistake in using es6 object literal notation in the reducer, as the property name was not as expected.

remo5000 · 2018-06-27T07:41:09Z

@ningyuansg I've added the "reset" feature. Do you think I could afford to keep currentAssessmentId and currentQuestionId in a tuple instead of separate properties?

ning-y · 2018-06-27T08:58:14Z

src/reducers/states.ts

  editorWidth: '50%',
  isRunning: false,
  output: [],
  replValue: '',
  sideContentActiveTab: 0,
-  sideContentHeight: undefined,
+  sideContentHeight: 60,


Does this cause overflow? A fresh workspace should render such that the side content takes up a size that is just big enough to prevent overflow of its contents.

ning-y · 2018-06-27T08:59:55Z

src/sagas/index.ts

@@ -15,7 +16,7 @@ function* mainSaga() {
  yield* apiFetchSaga()
  yield* interpreterSaga()


Can consider renaming as workspaceSaga

ning-y · 2018-06-27T09:00:43Z

Properties are more readable imo. Not sure about efficiency.

In line with the naming in the state and reducer.

remo5000 · 2018-06-27T12:58:54Z

Changes made! @ningyuansg

ning-y · 2018-06-28T03:25:56Z

Really big PR, gonna merge this in first.

remo5000 added 26 commits June 25, 2018 15:05

Remove updateEditorValue in workspace/DispatchProp

34a178c

I will add this back as an OwnProps property, passed by either Assessment or Playground

Rename workspaceSaga to playgroundSaga

4ed142c

Move actionTypes around

f6400d8

Move playground actions into workspace/actions

4f71473

Added an additional parameter to denote the location of the action call.

Disconnect all workspace components

389a3a1

Due to the workspace's input and dispatch being determined by the context, they can be passed in as props by Assessment or Playground.

Refactor components that call Workspace

92bd2d6

Fill in missing props in Playground and Assessment

e7c06dc

Also fixed some errors picked up at compilation time.

Pass in SideContentProps instead of tabs

ca9b246

Add location to saga calls

83fa368

Fix more errors

dd9a3a4

For some reason the member-ordering linting does not pass despite proper(?) ordering. I'll open an issue for this.

Modify default values for ControlBar

60a1a44

Add location for reducer cases

0f5780e

Also made some interpreter actions to include location

Fix PlaygroundContainer's IState reference

d07a85c

- Removed cached editorValue - Renamed IState.workspace into workspaces - Fixed a typo

Add location to sagas

49df071

Fix reducer naming error

b7a6e94

Rename workspace file to workspaces

b6d1b5a

Add MapDispatchToProps call and DispatchProps

b55e7f5

Add dispatch and state references to container

797da3a

Use dispatch props in Playground component

374fbcf

Also added a missing handleChangeActiveTab

Fix sideContentHeight not being stored in state

6e9a1c1

Remove buggy currying function

f1193f4

For some reason, the spread and rest operators did not work with the varying argument lengths. I proceeded to change them to a manual currying. Also fixed a bug with the argument type for handleEditorWidthChange.

Fix property bug with evaluation

02af528

Add state and dispatch for Assessment

59ca74d

Sepatate Contexts for playground and assessment

05e029b

Format and Update test snapshots

c51d87a

remo5000 requested a review from ning-y June 26, 2018 11:38

ning-y requested changes Jun 26, 2018

View reviewed changes

remo5000 added 2 commits June 27, 2018 10:49

Use more elegant enums

27bf990

Sort properties

e75f9d4

Update test because of sorting

947916c

remo5000 added 10 commits June 27, 2018 11:17

Use editorValue in Assessment

105cb91

Make editorValue possibly undefined

764e4ed

This allows the "presetting" of values like in the case of a solutionTemplate. However, it also forces any component to provide such a value, thus I have added a template string for playground.

Add .env to gitignore

5e40725

Add aciton to reset assessment workspace

c283e36

Add state slice for tracking assessment/question

e2d9a93

Format Assessment component

6e9a470

Add comopnent props to get the current Assessment

fcd3c41

Add update method for current assessment

8f750fc

Clean up logic for updating

ac86239

Format and update tests

b64557f

ning-y requested changes Jun 27, 2018

View reviewed changes

ning-y and others added 6 commits June 27, 2018 17:08

Fix member ordering

5924403

Fix sideContentHeight not auto-adjusting

7adfc18

Rename saga

52da48d

Rename actions/workspace -> actions/workspaces

eea266d

In line with the naming in the state and reducer.

Fix playground default text bug

ad927aa

Format some files

4030286

ning-y merged commit de365d8 into master Jun 28, 2018

This was referenced Jun 28, 2018

ControlBar not passing tslint:member-ordering rule #136

Closed

Refactor playground actions => interpreter actions #51

Closed

ning-y deleted the segregate-workspace branch July 2, 2018 09:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Segregate Playground and Assessment Workspaces #137

Segregate Playground and Assessment Workspaces #137

Uh oh!

remo5000 commented Jun 26, 2018 •

edited

Loading

Uh oh!

ning-y Jun 26, 2018

Uh oh!

ning-y Jun 26, 2018

Uh oh!

ning-y Jun 26, 2018

Uh oh!

remo5000 commented Jun 27, 2018

Uh oh!

remo5000 commented Jun 27, 2018

Uh oh!

ning-y Jun 27, 2018

Uh oh!

ning-y Jun 27, 2018

Uh oh!

ning-y commented Jun 27, 2018

Uh oh!

remo5000 commented Jun 27, 2018

Uh oh!

ning-y commented Jun 28, 2018

Uh oh!

Uh oh!

		@@ -15,7 +16,7 @@ function* mainSaga() {
		yield* apiFetchSaga()
		yield* interpreterSaga()

Segregate Playground and Assessment Workspaces #137

Segregate Playground and Assessment Workspaces #137

Uh oh!

Conversation

remo5000 commented Jun 26, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Features

TODO

Uh oh!

ning-y Jun 26, 2018

Choose a reason for hiding this comment

Uh oh!

ning-y Jun 26, 2018

Choose a reason for hiding this comment

Uh oh!

ning-y Jun 26, 2018

Choose a reason for hiding this comment

Uh oh!

remo5000 commented Jun 27, 2018

Uh oh!

remo5000 commented Jun 27, 2018

Uh oh!

ning-y Jun 27, 2018

Choose a reason for hiding this comment

Uh oh!

ning-y Jun 27, 2018

Choose a reason for hiding this comment

Uh oh!

ning-y commented Jun 27, 2018

Uh oh!

remo5000 commented Jun 27, 2018

Uh oh!

ning-y commented Jun 28, 2018

Uh oh!

Uh oh!

remo5000 commented Jun 26, 2018 •

edited

Loading