Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Side content redux2 #2874

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"@blueprintjs/popover2": "^1.14.11",
"@blueprintjs/select": "^4.9.24",
"@octokit/rest": "^19.0.11",
"@reduxjs/toolkit": "^1.9.5",
"@sentry/browser": "^7.57.0",
"@sourceacademy/sharedb-ace": "^2.0.2",
"@sourceacademy/sling-client": "^0.1.0",
Expand Down Expand Up @@ -132,6 +133,7 @@
"eslint-plugin-simple-import-sort": "^7.0.0",
"https-browserify": "^1.0.0",
"husky": "^8.0.2",
"madge": "^6.1.0",
"npm-run-all": "^4.1.5",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
Expand Down
7 changes: 3 additions & 4 deletions src/commons/XMLParser/XMLParserHelper.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Chapter } from 'js-slang/dist/types';
import { Builder } from 'xml2js';

import { ExternalLibraryName } from '../application/types/ExternalTypes';
import {
Assessment,
AssessmentOverview,
Expand Down Expand Up @@ -118,7 +117,7 @@ const makeLibrary = (deploymentArr: XmlParseStrDeployment[] | undefined): Librar
} else {
const deployment = deploymentArr[0];
const external = deployment.IMPORT || deployment.EXTERNAL;
const nameVal = external ? external[0].$.name : 'NONE';
// const nameVal = external ? external[0].$.name : 'NONE';
const symbolsVal = external ? external[0].SYMBOL || [] : [];
const globalsVal = deployment.GLOBAL
? (deployment.GLOBAL.map(x => [x.IDENTIFIER[0], altEval(x.VALUE[0]), x.VALUE[0]]) as Array<
Expand All @@ -128,7 +127,7 @@ const makeLibrary = (deploymentArr: XmlParseStrDeployment[] | undefined): Librar
return {
chapter: parseInt(deployment.$.interpreter, 10) as Chapter,
external: {
name: nameVal as ExternalLibraryName,
// name: nameVal as ExternalLibraryName,
symbols: symbolsVal
},
globals: globalsVal
Expand Down Expand Up @@ -262,7 +261,7 @@ const exportLibrary = (library: Library) => {
},
EXTERNAL: {
$: {
name: library.external.name
// name: library.external.name
}
}
};
Expand Down
10 changes: 0 additions & 10 deletions src/commons/application/ApplicationReducer.ts

This file was deleted.

Loading
Loading