Skip to content
This repository was archived by the owner on Jun 6, 2024. It is now read-only.

optimization: Replace the url module with the querystring module #1825

Merged
Gerhut merged 1 commit into from
Mar 22, 2019
Merged

optimization: Replace the url module with the querystring module #1825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/webportal/src/app/cluster-view/hardware/hardware-detail.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
const hardwareDetailComponent = require('./hardware-detail.component.ejs');
const breadcrumbComponent = require('../../job/breadcrumb/breadcrumb.component.ejs');
const webportalConfig = require('../../config/webportal.config.js');
const url = require('url');
const querystring = require('querystring');

//

Expand All @@ -35,7 +35,7 @@ $(document).ready(() => {
$('#sidebar-menu--cluster-view').addClass('active');
$('#sidebar-menu--cluster-view--hardware').addClass('active');
let instance = '';
const query = url.parse(window.location.href, true).query;
const query = querystring.parse(window.location.search.replace(/^\?+/, ''));
if (query['instance']) {
instance = query['instance'];
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/webportal/src/app/job/job-submit/job-submit.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const loading = require('../loading/loading.component');
const webportalConfig = require('../../config/webportal.config.js');
const userAuth = require('../../user/user-auth/user-auth.component');
const jobSchema = require('./job-submit.schema.js');
const url = require('url');
const querystring = require('querystring');
const stripJsonComments = require('strip-json-comments');

const jobSubmitHtml = jobSubmitComponent({
Expand Down Expand Up @@ -159,7 +159,7 @@ $(document).ready(() => {
window.onresize = function() {
resize();
};
const query = url.parse(window.location.href, true).query;
const query = querystring.parse(window.location.search.replace(/^\?+/, ''));
const op = query.op;
const type = query.type;
const username = query.user;
Expand Down
4 changes: 2 additions & 2 deletions src/webportal/src/app/marketplace/job-submit/job-submit.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const common = require('../template-common/template-search.component.js');
const userAuth = require('../../user/user-auth/user-auth.component');
const submitComponent = require('./job-submit.component.ejs');
const userTemplate = require('./sub-components/user-template.js');
const url = require('url');
const querystring = require('querystring');

require('./job-submit.component.scss');
require('./sub-components/task-format.scss');
Expand Down Expand Up @@ -122,7 +122,7 @@ $(document).ready(() => {
}
}, false);

const query = url.parse(window.location.href, true).query;
const query = querystring.parse(window.location.search.replace(/^\?+/, ''));
const type = query.type;
const name = query.name;
const username = query.user;
Expand Down
4 changes: 2 additions & 2 deletions src/webportal/src/app/user/user-login/user-login.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


// module dependencies
const url = require('url');
const querystring = require('querystring');
const breadcrumbComponent = require('../../job/breadcrumb/breadcrumb.component.ejs');
const userLoginComponent = require('./user-login.component.ejs');
const webportalConfig = require('../../config/webportal.config.js');
Expand Down Expand Up @@ -54,7 +54,7 @@ $(document).ready(() => {
cookies.set('token', data.token, {expires: expiration});
cookies.set('admin', data.admin, {expires: expiration});
cookies.set('hasGitHubPAT', data.hasGitHubPAT, {expires: expiration});
const query = url.parse(window.location.href, true).query;
const query = querystring.parse(window.location.search.replace(/^\?+/, ''));
window.location.replace(query.origin ? query.origin : '/');
}
},
Expand Down