diff --git a/Client/httpInterface.js b/Client/httpInterface.js index a930697b6..34c8f5823 100644 --- a/Client/httpInterface.js +++ b/Client/httpInterface.js @@ -1070,13 +1070,6 @@ exports.newHttpInterface = function newHttpInterface(WEB_SERVER, DATA_FILE_SERVE } break - case 'ProjectNames': - { - let projects = getDirectories(global.env.PATH_TO_PROJECTS) - respondWithContent(JSON.stringify(projects), httpResponse) - } - break - case 'Schema': { sendSchema(global.env.PATH_TO_PROJECTS + '/' + requestParameters[2] + '/Schemas/', requestParameters[3]) diff --git a/Projects/Education/UI/Spaces/Docs-Space/CommandInterface.js b/Projects/Education/UI/Spaces/Docs-Space/CommandInterface.js index 3d8399203..2568451b8 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/CommandInterface.js +++ b/Projects/Education/UI/Spaces/Docs-Space/CommandInterface.js @@ -486,9 +486,9 @@ function newFoundationsDocsCommmandInterface() { let requestsSent = 0 let responseCount = 0 let okResponses = 0 - for (let j = 0; j < PROJECTS_ARRAY.length; j++) { + for (let j = 0; j < PROJECTS_SCHEMA.length; j++) { let docsSchema - let project = PROJECTS_ARRAY[j] + let project = PROJECTS_SCHEMA[j].name docsSchema = SCHEMAS_BY_PROJECT.get(project).array.docsNodeSchema httpRequest(JSON.stringify(docsSchema), 'Docs/Save-Node-Schema/' + project, onResponse) @@ -538,8 +538,8 @@ function newFoundationsDocsCommmandInterface() { Since all the changes where saved, we need to remove the change flags at the different shcema documents. We also need to remove from the arrays the deleted items. */ - for (let j = 0; j < PROJECTS_ARRAY.length; j++) { - let project = PROJECTS_ARRAY[j] + for (let j = 0; j < PROJECTS_SCHEMA.length; j++) { + let project = PROJECTS_SCHEMA[j].name let documents /* Nodes */ diff --git a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js index b291a6eaa..04a3eae45 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Education/UI/Spaces/Docs-Space/DocsSpace.js @@ -135,8 +135,8 @@ function newEducationDocSpace() { app schemas into a single map, that will allow us to know when a phrase is a label of a menu and then change its style. */ - for (let i = 0; i < PROJECTS_ARRAY.length; i++) { - let project = PROJECTS_ARRAY[i] + for (let i = 0; i < PROJECTS_SCHEMA.length; i++) { + let project = PROJECTS_SCHEMA[i].name let appSchemaArray = SCHEMAS_BY_PROJECT.get(project).array.appSchema for (let j = 0; j < appSchemaArray.length; j++) { diff --git a/Projects/Education/UI/Spaces/Docs-Space/SearchEngine.js b/Projects/Education/UI/Spaces/Docs-Space/SearchEngine.js index d8d9a32c9..5abb14cf3 100644 --- a/Projects/Education/UI/Spaces/Docs-Space/SearchEngine.js +++ b/Projects/Education/UI/Spaces/Docs-Space/SearchEngine.js @@ -38,8 +38,8 @@ function newFoundationsDocsSearchEngine() { setUpWorkspaceSchemas() thisObject.docsIndex = [] - for (let j = 0; j < PROJECTS_ARRAY.length; j++) { - let project = PROJECTS_ARRAY[j] + for (let j = 0; j < PROJECTS_SCHEMA.length; j++) { + let project = PROJECTS_SCHEMA[j].name let documentIndex @@ -287,8 +287,8 @@ function newFoundationsDocsSearchEngine() { /* We will create a document for each node, so that can later be indexed into the search engine. */ - for (let j = 0; j < PROJECTS_ARRAY.length; j++) { - let project = PROJECTS_ARRAY[j] + for (let j = 0; j < PROJECTS_SCHEMA.length; j++) { + let project = PROJECTS_SCHEMA[j].name SCHEMAS_BY_PROJECT.get(project).array.workspaceSchema = [] SCHEMAS_BY_PROJECT.get(project).map.workspaceSchema = new Map() diff --git a/Projects/Education/UI/Utilities/Docs.js b/Projects/Education/UI/Utilities/Docs.js index 45728ef51..0825b4a8c 100644 --- a/Projects/Education/UI/Utilities/Docs.js +++ b/Projects/Education/UI/Utilities/Docs.js @@ -549,8 +549,8 @@ function newEducationUtilitiesDocs() { let found = false let docsSchemaDocument - for (let j = 0; j < PROJECTS_ARRAY.length; j++) { - let project = PROJECTS_ARRAY[j] + for (let j = 0; j < PROJECTS_SCHEMA.length; j++) { + let project = PROJECTS_SCHEMA[j].name docsSchemaDocument = SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema.get(type) if (docsSchemaDocument !== undefined) { found = true @@ -651,8 +651,8 @@ function newEducationUtilitiesDocs() { let found = false for (let j = MAX_NUMBER_OF_WORDS - 1; j >= 0; j--) { - for (let p = 0; p < PROJECTS_ARRAY.length; p++) { - let project = PROJECTS_ARRAY[p] + for (let p = 0; p < PROJECTS_SCHEMA.length; p++) { + let project = PROJECTS_SCHEMA[p].name searchInSchema(SCHEMAS_BY_PROJECT.get(project).map.docsNodeSchema, 'Node') searchInSchema(SCHEMAS_BY_PROJECT.get(project).map.docsConceptSchema, 'Concept') diff --git a/Projects/Foundations/UI/Spaces/Design-Space/DesignSpace.js b/Projects/Foundations/UI/Spaces/Design-Space/DesignSpace.js index b555d614b..c803da0a5 100644 --- a/Projects/Foundations/UI/Spaces/Design-Space/DesignSpace.js +++ b/Projects/Foundations/UI/Spaces/Design-Space/DesignSpace.js @@ -36,8 +36,8 @@ function newFoundationsDesignSpace() { function buildIconByProjectAndTypeMap() { /* Take types-icons relationships defined at the schema */ - for (let i = 0; i < PROJECTS_ARRAY.length; i++) { - let project = PROJECTS_ARRAY[i] + for (let i = 0; i < PROJECTS_SCHEMA.length; i++) { + let project = PROJECTS_SCHEMA[i].name addSchemaTypes(SCHEMAS_BY_PROJECT.get(project).array.appSchema) addSchemaTypes(SCHEMAS_BY_PROJECT.get(project).array.docsNodeSchema) diff --git a/Projects/Foundations/UI/Spaces/Design-Space/Workspace.js b/Projects/Foundations/UI/Spaces/Design-Space/Workspace.js index d19d75d85..f7ef174a3 100644 --- a/Projects/Foundations/UI/Spaces/Design-Space/Workspace.js +++ b/Projects/Foundations/UI/Spaces/Design-Space/Workspace.js @@ -64,8 +64,8 @@ function newWorkspace() { UI.projects.foundations.utilities.statusBar.changeStatus("Initializing...") /* Set up the action switches map */ - for (let i = 0; i < PROJECTS_ARRAY.length; i++) { - let project = PROJECTS_ARRAY[i] + for (let i = 0; i < PROJECTS_SCHEMA.length; i++) { + let project = PROJECTS_SCHEMA[i].name let actionSwitch = eval('new' + project + 'ActionSwitch()') actionSwitchesByProject.set(project, actionSwitch) } diff --git a/UI/AppPostLoader.js b/UI/AppPostLoader.js index 02d140eee..aeb74d5d2 100644 --- a/UI/AppPostLoader.js +++ b/UI/AppPostLoader.js @@ -14,10 +14,7 @@ function newAppPostLoader() { function start() { try { - /* Moving PROJECTS_ARRAY to the global variable */ - PROJECTS_ARRAY = window.PROJECTS - window.PROJECTS = undefined - + setBrowserEvents() setupProjectsSchema() @@ -35,8 +32,8 @@ function newAppPostLoader() { let totalWebServerCalls = 0 let webServerResponses = 0 - for (let i = 0; i < PROJECTS_ARRAY.length; i++) { - let project = PROJECTS_ARRAY[i] + for (let i = 0; i < PROJECTS_SCHEMA.length; i++) { + let project = PROJECTS_SCHEMA[i].name let schemas = { array: { appSchema: [], diff --git a/UI/AppPreLoader.js b/UI/AppPreLoader.js index ba6255917..c43adf123 100644 --- a/UI/AppPreLoader.js +++ b/UI/AppPreLoader.js @@ -127,17 +127,7 @@ function loadSuperalgos() { function onRequired(pModule) { if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] " + path + " downloaded."); } - setUpProjects(); - } - } - - function setUpProjects() { - let url = 'ProjectNames' - httpRequest(undefined, url, onResponse) - - function onResponse(err, projects) { - window.PROJECTS = JSON.parse(projects) - loadModules() + loadModules(); } } diff --git a/UI/Globals.js b/UI/Globals.js index e526fecf2..53f2b0e8f 100644 --- a/UI/Globals.js +++ b/UI/Globals.js @@ -1,7 +1,6 @@ /* Global Constatns */ let canvas -let PROJECTS_ARRAY let PROJECTS_SCHEMA let SCHEMAS_BY_PROJECT = new Map() /* New Root object*/