From 4ec5445c31cfa0e61ccaecd0be69ad49ccc68c17 Mon Sep 17 00:00:00 2001 From: Omnia Kahla Date: Thu, 17 Sep 2020 13:42:14 +0200 Subject: [PATCH] url with no parameters in user group, remove all console logs, moving the user group component to the user action engine #383 --- backend/routes/action.js | 76 ++++++------------- backend/routes/user.js | 17 ++--- package-lock.json | 12 ++- package.json | 2 +- .../apps/my-files/my-files.component.ts | 2 +- src/app/app-engine/nie-OS.module.ts | 7 +- .../dashboard/dashboard.module.ts | 54 +++++++------ .../dashboard/dashboard.component.ts | 42 +++++----- .../mongodb/auth/auth.service.ts | 4 +- .../user-group/user-group.component.html | 0 .../user-group/user-group.component.scss | 0 .../user-group/user-group.component.ts | 30 ++++---- 12 files changed, 109 insertions(+), 137 deletions(-) rename src/app/{app-engine => user-action-engine}/user-group/user-group.component.html (100%) rename src/app/{app-engine => user-action-engine}/user-group/user-group.component.scss (100%) rename src/app/{app-engine => user-action-engine}/user-group/user-group.component.ts (92%) diff --git a/backend/routes/action.js b/backend/routes/action.js index 7a2ee087..1b136343 100644 --- a/backend/routes/action.js +++ b/backend/routes/action.js @@ -133,10 +133,9 @@ if(arrayOfItems.length ==0){ } for (let i = 0; i < arrayOfItems.length; i++) { - console.log(arrayOfItems[i]._id); - console.log(itemToSearch._id); + if (arrayOfItems[i]._id.toString() == itemToSearch._id.toString()) { - console.log(i); + return i; } } @@ -148,18 +147,18 @@ function addFiles(req, res,oldHostUrl, newHostUrl) { let filesJsonExported = JSON.parse(JSON.parse(JSON.stringify(req.body.filesJson.split(oldHostUrl).join(newHostUrl)))); let projectFiles = req.body.projectFiles; - console.log('req.body.projectFiles'); + //console.log('req.body.projectFiles'); //console.log(req.body.projectFiles); let newFiles = filesJsonExported.slice(); - console.log(newFiles); + ///console.log(newFiles); let filesIndices = []; if (projectFiles.length != 0 || filesJsonExported) { filesJsonExported.forEach(file => { filesIndices.push(file._id); }); Files.find({_id: {$in: filesIndices}}).then(foundFiles => { - console.log("foundFiles " + foundFiles); + //console.log("foundFiles " + foundFiles); foundFiles.forEach(item => { let index = searchItemInArray(item, newFiles); if (index != -1) { @@ -168,12 +167,12 @@ function addFiles(req, res,oldHostUrl, newHostUrl) { }); if (newFiles.length != 0) { Files.insertMany(newFiles, {ordered: false}).then(filesInserted => { - console.log("files inserted"); - console.log(filesInserted); + // console.log("files inserted"); + // console.log(filesInserted); let counter = projectFiles.length; projectFiles.forEach(file => { let path = 'backend/files/' + file.fileName; - console.log(path); + //console.log(path); //console.log(file.fileContent); //const data = new Uint8Array(Buffer.from(file.fileContent)); var buf = new Buffer(file.fileContent, 'binary'); //base64 @@ -185,7 +184,7 @@ function addFiles(req, res,oldHostUrl, newHostUrl) { error: err }); } - console.log(file.fileName + "has been added to the server"); + // console.log(file.fileName + "has been added to the server"); counter--; }); }); @@ -213,22 +212,15 @@ function addFiles(req, res,oldHostUrl, newHostUrl) { } function addFolders(req, res,oldHostUrl,newHostUrl) { - console.log("add Folders started"); if(req.body.foldersJson) { - - let foldersJsonExported = JSON.parse(JSON.parse(JSON.stringify(req.body.foldersJson))); let newFolders = foldersJsonExported.slice(); - console.log("newFolders"); - console.log(newFolders); let folderIndices = []; if (foldersJsonExported) { foldersJsonExported.forEach(folder => { folderIndices.push(folder._id); }); Folder.find({_id: {$in: folderIndices}}).then(foundFolders => { - console.log("foundFolders"); - console.log(foundFolders); foundFolders.forEach(item => { let index = searchItemInArray(item, newFolders); if (index != -1) { @@ -236,11 +228,7 @@ function addFolders(req, res,oldHostUrl,newHostUrl) { } }); if (newFolders && newFolders.length > 0) { - console.log("newFolders"); - console.log(newFolders); Folder.insertMany(newFolders, {ordered: false}).then(foldersResults => { - console.log("folders inserted"); - console.log(foldersResults); addFiles(req, res, oldHostUrl, newHostUrl); }).catch(foundFoldersError => { res.status(500).json({ @@ -253,7 +241,6 @@ function addFolders(req, res,oldHostUrl,newHostUrl) { } }).catch(foldersError => { - // tempError=true; res.status(500).json({ message: 'Something happened while Searching for the Folders', error: foldersError @@ -262,19 +249,16 @@ function addFolders(req, res,oldHostUrl,newHostUrl) { } } else{ - console.log( "The project has no Folders"); addFiles(req, res, oldHostUrl, newHostUrl); } } function addMyOwnJsons(req, res, oldHostUrl, newHostUrl) { - console.log("start addMyOwnJson"); if(req.body.jsonQueries) { let myOwnJsonExported = JSON.parse(JSON.parse(JSON.stringify(req.body.jsonQueries.split(oldHostUrl).join(newHostUrl)))); - console.log(myOwnJsonExported); let newMyOwnJsons = myOwnJsonExported.slice(); let myOwnJsonIndices = []; if (myOwnJsonExported) { @@ -287,14 +271,11 @@ if(req.body.jsonQueries) { let index = searchItemInArray(item, newMyOwnJsons); if (index != -1) { newMyOwnJsons.splice(index, 1); - console.log(newMyOwnJsons); } }); if (newMyOwnJsons && newMyOwnJsons.length > 0) { - console.log("start inserting myOwnJsons"); - console.log(newMyOwnJsons); + MyOwnJSON.insertMany(newMyOwnJsons, {ordered: false}).then(jsonsInserted => { - console.log("my Json inserted successfully "); addFolders(req, res, oldHostUrl, newHostUrl); }).catch(jsonsInserted => { @@ -304,7 +285,6 @@ if(req.body.jsonQueries) { }); }); } else { - console.log("else in addMyOwnJson"); addFolders(req, res, oldHostUrl, newHostUrl); } }).catch(jsonsSearchError => { @@ -315,13 +295,11 @@ if(req.body.jsonQueries) { }); } else{ - console.log( "The project has no Jsons"); addFolders(req, res, oldHostUrl, newHostUrl); } } function addQueries( req, res, oldHostUrl,newHostUrl) { - console.log("start adding the queries"); if(req.body.queries){ let queriesExported = JSON.parse(JSON.parse(JSON.stringify(req.body.queries.split(oldHostUrl).join(newHostUrl)))); let queriesIndices=[]; @@ -339,10 +317,7 @@ function addQueries( req, res, oldHostUrl,newHostUrl) { } }); if(newQueries && newQueries.length>0){ - console.log("newQueries is not empty, insert them "); - console.log(newQueries); Query.insertMany(newQueries, {ordered: false}).then(queriesInserted => { - console.log(queriesInserted); addMyOwnJsons(req, res, oldHostUrl,newHostUrl); }).catch(queriesInsertedError => { res.status(500).json({ @@ -363,7 +338,6 @@ function addQueries( req, res, oldHostUrl,newHostUrl) { }); } else{ - console.log( "The project has no queries"); addMyOwnJsons(req, res, oldHostUrl,newHostUrl); } @@ -372,7 +346,6 @@ function addQueries( req, res, oldHostUrl,newHostUrl) { function addPages( req, res, oldHostUrl, newHostUrl) { let pagesExported = JSON.parse(JSON.parse(JSON.stringify(req.body.pages.split(oldHostUrl).join(newHostUrl)))); Page.insertMany(pagesExported).then(pagesInserted => { - //console.log(pagesInserted); addQueries(req, res, oldHostUrl, newHostUrl); return res.status(201).json({ message: 'Project created successfully', @@ -386,9 +359,8 @@ function addPages( req, res, oldHostUrl, newHostUrl) { } function addComments(req, res, oldHostUrl, newHostUrl) { - console.log("I am here in add comments"); + if(req.body.comments){ - //console.log(req.body.comments); let commentsExported= JSON.parse(JSON.parse(JSON.stringify(req.body.comments.split(oldHostUrl).join(newHostUrl)))); let newComments = commentsExported.slice(); let commentsIndices=[]; @@ -422,17 +394,16 @@ function addComments(req, res, oldHostUrl, newHostUrl) { } } else{ - console.log("No Comments were found, start adding the pages"); addPages( req, res, oldHostUrl, newHostUrl); } } router.post('/createProject/', checkAuth, (req, res, next) => { - //console.log(req.body); + let oldHostUrl = req.body.oldHostUrl; let newHostUrl = req.protocol + "://" + req.get("host"); - console.log(req.body.action); + let actionExported = new Action(JSON.parse(JSON.parse(JSON.stringify(req.body.action.split(oldHostUrl).join(newHostUrl))))); let pageSetExported = new PageSet(JSON.parse(JSON.parse(JSON.stringify(req.body.pageSet.split(oldHostUrl).join(newHostUrl))))); actionExported.save() @@ -462,7 +433,7 @@ router.post('/createProject/', checkAuth, (req, res, next) => { }); router.post('/reloadProject/', checkAuth, (req, res, next) => { - console.log(req.body.pageSetId); + let pageSet_id = req.body.pageSetId; const newAction = new Action({ title: '', @@ -473,9 +444,9 @@ router.post('/reloadProject/', checkAuth, (req, res, next) => { deleted: false }); PageSet.find({_id: pageSet_id}).then(pageSet => { - console.log(pageSet); + Page.findOne({_id: pageSet[0].hasPages[0]}).then(mainPage => { - console.log(mainPage); + newAction.title = mainPage.title; newAction.description = mainPage.description; newAction.hasPageSet = pageSet[0]._id; @@ -483,16 +454,16 @@ router.post('/reloadProject/', checkAuth, (req, res, next) => { Page.find({_id: {$in: pageSet[0].hasPages}}).then(allPages => { let queries = []; if (allPages) { - console.log(allPages); + for (let i = 0; i < allPages.length; i++) { allPages[i].queries.forEach(query => { queries.push(query); }); } - console.log(queries); + if (queries.length != 0) { Query.find({_id: {$in: queries}}, {creator: 1}).then(creatorResults => { - console.log(creatorResults); + newAction.creator = creatorResults[0].creator; newAction.save().then(newActionCreated => { res.status(201).json({ @@ -500,14 +471,14 @@ router.post('/reloadProject/', checkAuth, (req, res, next) => { action: newActionCreated }); }).catch(newActionError => { - console.log(newActionError); + res.status(500).json({ message: 'Error while saving new Action', error: newActionError }); }) }).catch(creatorError => { - console.log(creatorError); + res.status(500).json({ message: 'Error retrieving Creator', error: creatorError @@ -516,21 +487,20 @@ router.post('/reloadProject/', checkAuth, (req, res, next) => { } } }).catch(allPagesError => { - console.log(allPagesError); + res.status(500).json({ message: 'Error retrieving All Pages', error: allPagesError }); }); }).catch(mainPageError => { - console.log(mainPageError); res.status(500).json({ message: 'Error retrieving main Page', error: mainPageError }); }); }).catch(pageSetErr => { - console.log(pageSetErr); + res.status(500).json({ message: 'Error retrieving PageSet', error: pageSetErr diff --git a/backend/routes/user.js b/backend/routes/user.js index 38c780e9..49bcc7b1 100644 --- a/backend/routes/user.js +++ b/backend/routes/user.js @@ -341,14 +341,12 @@ router.get('/:email/reset-password', (req, res, next) => { router.get('/:email/getUserByEmail', (req, res, next) => { User.findOne({email: req.params.email}) .then(result => { - console.log(result); res.status(201).json({ message: 'User Successfully found ', user: result }); }) .catch(err => { - console.log(err); return res.status(401).json({ message: 'Did not find user' }); @@ -497,9 +495,6 @@ router.get('/:id/queries', checkAuth, (req, res, next) => { router.post('/signup/:newsLetter', multer({storage: storage}).single("file"), (req, res, next) => { // Tests if email address is invalid const emailPattern = /^\S+[@]\S+[.]\S+$/; - console.log(req.body); - console.log(req.param); - console.log(req); if (!emailPattern.test(req.body.email)) { return res.status(400).json({ message: 'Your email address is invalid!' @@ -522,10 +517,9 @@ router.post('/signup/:newsLetter', multer({storage: storage}).single("file"), (r .then(hashPwd => { let filePath = req.body.usrProfileFilePath; if (req.file) { - console.log("uploaded a file "); - console.log((req.file.filename)); + filePath = req.body.host + "/assets/img/team/" + req.file.filename; - console.log(filePath); + } const user = new User({ email: req.body.email, @@ -537,7 +531,7 @@ router.post('/signup/:newsLetter', multer({storage: storage}).single("file"), (r }); user.save() .then(result => { - console.log(result); + res.status(201).json({ message: 'User was created', result: result @@ -559,7 +553,7 @@ router.post('/signup/:newsLetter', multer({storage: storage}).single("file"), (r router.post('/login', (req, res, next) => { let fetchedUser; - console.log('Login'); + User.findOne({email: req.body.email}) .then(user => { if (!user) { @@ -598,7 +592,7 @@ router.post('/login', (req, res, next) => { }); }) .catch(err => { - console.log(err); + return res.status(401).json({ message: 'Auth failed' }); @@ -607,7 +601,6 @@ router.post('/login', (req, res, next) => { router.post('/updateUsrProfilePic/:email', multer({storage: storage}).single("file"), (req, res, next) => { let filePath = ""; - console.log(" final file Path is " + filePath); User.findOne({email: req.params.email}).then(userFound => { if (req.file) { filePath = req.body.hostname + "/assets/img/team/" + req.file.filename; diff --git a/package-lock.json b/package-lock.json index bf792973..7bd081f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1205,6 +1205,12 @@ "@types/geojson": "*" } }, + "@types/lodash": { + "version": "4.14.161", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", + "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", + "dev": true + }, "@types/marked": { "version": "0.0.27", "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.0.27.tgz", @@ -7448,9 +7454,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha1-5I3e2+MLMyF4PFtDAfvTU7weSks=" + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "lodash.clonedeep": { "version": "4.5.0", diff --git a/package.json b/package.json index f9f3a48b..a1782bfb 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "@angular/language-service": "7.2.6", "@types/jasmine": "^3.3.9", "@types/jasminewd2": "^2.0.6", - "@types/lodash":"^4.14.161", + "@types/lodash": "^4.14.161", "@types/node": "^11.9.5", "codelyzer": "^4.5.0", "jasmine-core": "~3.3.0", diff --git a/src/app/app-engine/apps/my-files/my-files.component.ts b/src/app/app-engine/apps/my-files/my-files.component.ts index d4c715d1..a18d4189 100644 --- a/src/app/app-engine/apps/my-files/my-files.component.ts +++ b/src/app/app-engine/apps/my-files/my-files.component.ts @@ -593,7 +593,7 @@ appInputsArray = []; { queryParams: { actionID: pageSet.actionId, page: data.pageset.hasPages[0] - } + }, skipLocationChange: true }); console.log(data.pageset.hasPages[0]); }, error1 => { diff --git a/src/app/app-engine/nie-OS.module.ts b/src/app/app-engine/nie-OS.module.ts index 62676ff6..3785bdcd 100644 --- a/src/app/app-engine/nie-OS.module.ts +++ b/src/app/app-engine/nie-OS.module.ts @@ -103,7 +103,7 @@ import { GroupedBarChartV2Component } from './apps/grouped-bar-chart-v2/grouped- import { CommentOnIndicesComponent } from './apps/comment-on-indices/comment-on-indices.component'; //import {DataListViewDetailsDialogComponent} from './apps/data-list-view/data-list-view-details-dialog/data-list-view-details-dialog.component'; import { CalendarComponent } from './apps/calendar/calendar.component'; -import {UserGroupComponent} from './user-group/user-group.component'; +//import {UserGroupComponent} from '../user-action-engine/user-group/user-group.component'; import {SharedPipeModule} from '../../pipes/shared-pipe-module/shared-pipe.module'; @NgModule({ @@ -171,8 +171,7 @@ import {SharedPipeModule} from '../../pipes/shared-pipe-module/shared-pipe.modul { path: 'app-our-new-component', component: OurNewComponentComponent }, { path: 'gnd', component: GndLobidComponent }, { path: 'audio', component: AudioPlayerComponent }, - { path: 'calendar', component: CalendarComponent }, - { path: 'app-user-group', component: UserGroupComponent }, + { path: 'calendar', component: CalendarComponent } ]) ], providers: [ @@ -233,7 +232,7 @@ import {SharedPipeModule} from '../../pipes/shared-pipe-module/shared-pipe.modul PieChartV2Component, GroupedBarChartV2Component, CommentOnIndicesComponent, - UserGroupComponent, + //UserGroupComponent, //DataListViewDetailsDialogComponent, CalendarComponent ], diff --git a/src/app/user-action-engine/dashboard/dashboard.module.ts b/src/app/user-action-engine/dashboard/dashboard.module.ts index a8a551a4..773c3af0 100644 --- a/src/app/user-action-engine/dashboard/dashboard.module.ts +++ b/src/app/user-action-engine/dashboard/dashboard.module.ts @@ -3,7 +3,7 @@ import {CommonModule, DatePipe} from '@angular/common'; import {DashboardComponent, DialogOverviewExampleDialog} from './dashboard/dashboard.component'; import {RouterModule} from '@angular/router'; import {MatButtonModule} from '@angular/material/button'; -import { MatDialogModule, MatProgressSpinnerModule } from '@angular/material'; +import {MatDialogModule, MatProgressSpinnerModule, MatTableModule} from '@angular/material'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import {MatRadioModule} from '@angular/material/radio'; import {MatMenuModule} from '@angular/material/menu'; @@ -22,38 +22,42 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import {MatChipsModule} from '@angular/material/chips'; import {MatSelectModule} from '@angular/material/select'; import {NIEOSModule} from '../../app-engine/nie-OS.module'; +import {UserGroupComponent} from '../user-group/user-group.component'; @NgModule({ - imports: [ - CommonModule, - MatButtonModule, - MatDialogModule, - FormsModule, - ReactiveFormsModule, - MatRadioModule, - MatMenuModule, - MatIconModule, - MatInputModule, - MatFormFieldModule, - MatProgressSpinnerModule, - MatExpansionModule, - MatCardModule, - StaticPagesModule, - MatTooltipModule, - MatChipsModule, - MatSelectModule, - RouterModule.forRoot([ - {path: 'dashboard', component: DashboardComponent}, - {path: 'impressum', component: ImpressumComponent}, - ]), - NIEOSModule - ], + imports: [ + CommonModule, + MatButtonModule, + MatDialogModule, + FormsModule, + ReactiveFormsModule, + MatRadioModule, + MatMenuModule, + MatIconModule, + MatInputModule, + MatFormFieldModule, + MatProgressSpinnerModule, + MatExpansionModule, + MatCardModule, + StaticPagesModule, + MatTooltipModule, + MatChipsModule, + MatSelectModule, + RouterModule.forRoot([ + {path: 'dashboard', component: DashboardComponent}, + {path: 'impressum', component: ImpressumComponent}, + {path: 'app-user-group', component: UserGroupComponent}, + ]), + NIEOSModule, + MatTableModule + ], declarations: [ DashboardComponent, DialogOverviewExampleDialog, EditActionComponent, DeleteActionComponent, ImpressumComponent, + UserGroupComponent, HeaderComponent ], entryComponents: [ diff --git a/src/app/user-action-engine/dashboard/dashboard/dashboard.component.ts b/src/app/user-action-engine/dashboard/dashboard/dashboard.component.ts index 7270c0d5..ba3091db 100644 --- a/src/app/user-action-engine/dashboard/dashboard/dashboard.component.ts +++ b/src/app/user-action-engine/dashboard/dashboard/dashboard.component.ts @@ -96,12 +96,12 @@ export class DashboardComponent implements OnInit { this.commentService.getAllCommentsOfUser() .subscribe( data => { - console.log(data); + //console.log(data); this.commentArray = (data as any).comments; for (let i = 0; i < this.commentArray.length; i++) { if (!this.commentArray[i].creator.usrProfileFilePath) { this.commentArray[i].creator.usrProfileFilePath = environment.app + '/assets/img/team/user-icon-vector.jpg'; - console.log(this.commentArray[i].creator.usrProfileFilePath); + // console.log(this.commentArray[i].creator.usrProfileFilePath); } this.createQueryInformationOfComment(i); } @@ -156,7 +156,7 @@ export class DashboardComponent implements OnInit { this.usergroupService.getAllUserGroups() .subscribe( usergroupresponse => { - console.log(usergroupresponse); + // console.log(usergroupresponse); this.userGroups = (usergroupresponse as any).body.groups; }, error => console.log(error) @@ -181,7 +181,7 @@ export class DashboardComponent implements OnInit { }); })) .subscribe(transformedActions => { - console.log(transformedActions); + //console.log(transformedActions); this.actions = transformedActions; }); } @@ -197,22 +197,22 @@ export class DashboardComponent implements OnInit { } }); dialogRef.afterClosed().subscribe((result) => { - console.log(result); + //console.log(result); this.updateActions(); this.getUserGroups(); if (result) { - console.log(result); + //console.log(result); const newPage: any = {}; this.actionService.getAction(result[1]) .subscribe( actionResult => { - console.log('actionService - get Action: '); - console.log(actionResult); + //console.log('actionService - get Action: '); + // console.log(actionResult); newPage.title = actionResult.body.action.title; newPage.description = actionResult.body.action.description; this.pageService.createPage(actionResult.body.action.hasPageSet._id, newPage) .subscribe((result2) => { - console.log('open dialog'); + //console.log('open dialog'); this.router.navigate(['/page'], { queryParams: @@ -263,9 +263,9 @@ export class DashboardComponent implements OnInit { this.actionService.updateAction(action) .subscribe( data => { - console.log(data); + //console.log(data); }, error => { - console.log(error); + //console.log(error); } ); } @@ -274,7 +274,7 @@ export class DashboardComponent implements OnInit { if (action.type === 'page-set') { this.actionService.getAction(action.id) .subscribe(data => { - console.log('continue action'); + //console.log('continue action'); if (data.body.action.hasPageSet.hasPages !== null && data.body.action.hasPageSet.hasPages[0]._id) { action.hasPage = data.body.action.hasPageSet.hasPages[0]._id; this.router.navigate(['/page'], @@ -286,13 +286,13 @@ export class DashboardComponent implements OnInit { }); } }, error => { - console.log(error); + //console.log(error); }); } } goToDocumentIndex(action: any) { - console.log('goToDocumentIndex'); + //console.log('goToDocumentIndex'); this.router.navigate(['/page-set'], { queryParams: { @@ -302,8 +302,8 @@ export class DashboardComponent implements OnInit { } sendMessage() { - console.log('Send Message'); - console.log(this.message); + //console.log('Send Message'); + //console.log(this.message); this.contactService.sendMessage(this.message) .subscribe(response => { console.log(response); @@ -372,7 +372,7 @@ export class DashboardComponent implements OnInit { } }); dialogRef.afterClosed().subscribe((result) => { - console.log(result); + //console.log(result); }); } @@ -381,7 +381,7 @@ export class DashboardComponent implements OnInit { if (action.type === 'page-set') { this.fileService.downloadProject(action.id) .subscribe(data => { - console.log(data); + //console.log(data); console.log('data returned successfully'); const a = document.createElement('a'); document.body.appendChild(a); @@ -450,7 +450,7 @@ export class DashboardComponent implements OnInit { } showUserGroupDetails(_id: any) { - console.log(_id); + // console.log(_id); this.router.navigate(['app-user-group'], { queryParams: { usrGroupId: _id @@ -517,10 +517,10 @@ export class DialogOverviewExampleDialog { this.usergroup.description) .subscribe( data => { - console.log(data); + //console.log(data); this.dialogRef.close(data); }, error => { - console.log(error); + //console.log(error); } ); } diff --git a/src/app/user-action-engine/mongodb/auth/auth.service.ts b/src/app/user-action-engine/mongodb/auth/auth.service.ts index 9c6ff30e..0ae80261 100644 --- a/src/app/user-action-engine/mongodb/auth/auth.service.ts +++ b/src/app/user-action-engine/mongodb/auth/auth.service.ts @@ -138,7 +138,7 @@ export class AuthService { } >(`${AuthService.API_BASE_URL_USER}/login`, authData) .subscribe( response => { - console.log( response ); + //console.log( response ); const token = response.token; this.token = token; const expiresInDuration = response.expiresIn; @@ -215,7 +215,7 @@ export class AuthService { 'userId', userId ); - console.log(localStorage); + //console.log(localStorage); } private clearAuthData() { diff --git a/src/app/app-engine/user-group/user-group.component.html b/src/app/user-action-engine/user-group/user-group.component.html similarity index 100% rename from src/app/app-engine/user-group/user-group.component.html rename to src/app/user-action-engine/user-group/user-group.component.html diff --git a/src/app/app-engine/user-group/user-group.component.scss b/src/app/user-action-engine/user-group/user-group.component.scss similarity index 100% rename from src/app/app-engine/user-group/user-group.component.scss rename to src/app/user-action-engine/user-group/user-group.component.scss diff --git a/src/app/app-engine/user-group/user-group.component.ts b/src/app/user-action-engine/user-group/user-group.component.ts similarity index 92% rename from src/app/app-engine/user-group/user-group.component.ts rename to src/app/user-action-engine/user-group/user-group.component.ts index 5d9242f2..88d29b0f 100644 --- a/src/app/app-engine/user-group/user-group.component.ts +++ b/src/app/user-action-engine/user-group/user-group.component.ts @@ -1,10 +1,10 @@ -import {UsergroupService} from '../../user-action-engine/mongodb/usergroup/usergroup.service'; +import {UsergroupService} from '../mongodb/usergroup/usergroup.service'; import {ActivatedRoute, Router} from '@angular/router'; -import {ActionService} from '../../user-action-engine/mongodb/action/action.service'; +import {ActionService} from '../mongodb/action/action.service'; import {Component, OnInit} from '@angular/core'; import {FormControl, FormGroup, Validators} from '@angular/forms'; import {MatTableDataSource} from '@angular/material'; -import {AuthService} from '../../user-action-engine/mongodb/auth/auth.service'; +import {AuthService} from '../mongodb/auth/auth.service'; import {environment} from '../../../environments/environment'; import Stardog from 'stardog'; import consistency = Stardog.db.reasoning.consistency; @@ -54,12 +54,12 @@ export class UserGroupComponent implements OnInit { this.actions = []; this.userGroupService.showUserGroupDetails(this.groupId) .subscribe((result: any) => { - console.log(result); + // console.log(result); this.userGroupTitle = result.body.userGroup.title; if (result.body.actions || result.body.userGroup) { this.userGroup = result.body.userGroup; this.users = this.userGroup.users; - console.log(this.users); + // console.log(this.users); this.dataSource = new MatTableDataSource(this.users); this.adminUsers = this.userGroup.adminsUsers; // list of the admin users id this.userAdmin = result.body.userAdmin; // true if the user is one of the admin users @@ -77,7 +77,7 @@ export class UserGroupComponent implements OnInit { }); } - console.log(this.actions); + // console.log(this.actions); const temp = this.actions.map((obj) => ({...obj, ['color']: '', ['pages']: []})); this.actions = temp; result.body.userGroup.hasActions.forEach(actionInUserGroup => { @@ -85,7 +85,7 @@ export class UserGroupComponent implements OnInit { if (indexOfAction !== -1) { this.actions[indexOfAction].color = 'green'; // found in my list as well, update the pages. this.actions[indexOfAction].pages = []; - console.log(actionInUserGroup.hasPages); + // console.log(actionInUserGroup.hasPages); actionInUserGroup.hasPages.forEach(pageInUsrGrp => { if (this.searchObjIdInArray(pageInUsrGrp._id, this.actions[indexOfAction].hasPageSet.hasPages) !== -1) { this.actions[indexOfAction].pages.push({page: pageInUsrGrp, toAdd: false}); @@ -101,7 +101,7 @@ export class UserGroupComponent implements OnInit { this.actions[this.actions.length - 1].pages.push({page: page, toAdd: false}); }); } - console.log(this.actions); + // console.log(this.actions); }); } }); @@ -109,7 +109,7 @@ export class UserGroupComponent implements OnInit { addProjectToUserGroup(action: any, pages?: any) { const pagesId = []; - console.log(action); + // console.log(action); if (action.color === 'green') { // the project is one of the user group projects alert('The project is already in the userGroup, you can add/remove its pages'); return; @@ -130,7 +130,7 @@ export class UserGroupComponent implements OnInit { } removeProjectFromUserGroup(action: any) { - console.log(action._id, this.groupId); + // console.log(action._id, this.groupId); this.userGroupService.deleteProjectFromUserGroup(action._id, this.groupId).subscribe(results => { this.updateVariables(); // console.log(results); @@ -169,10 +169,10 @@ export class UserGroupComponent implements OnInit { this.emailForm.reset(); this.updateUsers(results.user._id, admin, true, null, results.user.email, results.user.usrProfileFilePath); }, err => { - console.log(err); + // console.log(err); }); }, error => { - console.log(error); + // console.log(error); }); } @@ -185,7 +185,7 @@ export class UserGroupComponent implements OnInit { this.pages.push({page: page, toAdd: true}); }); } - console.log(this.pages); + // console.log(this.pages); } private searchObjIdInArray(ObjId: any, arrayOfObjects: Array, refObj?: string) { @@ -203,7 +203,7 @@ export class UserGroupComponent implements OnInit { this.userGroupService.deleteUser(this.groupId, userId, admin).subscribe(deletedUser => { this.updateUsers(userId, admin, false, removeCompletly); }, err => { - console.log(err); + // console.log(err); }); } @@ -213,7 +213,7 @@ export class UserGroupComponent implements OnInit { this.adminUsers.push({_id: id}); } else { this.users.push({_id: id, usrProfileFilePath: usrProfileFilePath, email: userEMail, password: ''}); - console.log(this.users); + // console.log(this.users); } } else { if ( removeCompletly) {