Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

fix lint of PR#455 for Issue#453 #456

Merged
merged 1 commit into from
Jun 2, 2022
Merged
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
6 changes: 3 additions & 3 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ module.exports.frontendConfigs = {
GITHUB_TEAM_URL: process.env.GITHUB_TEAM_URL || 'https://github.com/orgs/',
GITLAB_GROUP_URL: process.env.GITLAB_GROUP_URL || 'https://gitlab.com/groups/',
TC_API_V5_URL: process.env.TC_API_V5_URL || 'https://api.topcoder-dev.com/v5',
TC_API_V4_URL: {
TOPCODER_VALUES: {
dev: {
process.env.TC_API_V4_URL || 'https://api.topcoder-dev.com/v4',
TC_API_V4_URL: process.env.TC_API_V4_URL || 'https://api.topcoder-dev.com/v4',
},
prod: {
process.env.TC_API_V4_URL || 'https://api.topcoder.com/v4',
TC_API_V4_URL: process.env.TC_API_V4_URL || 'https://api.topcoder.com/v4',
},
},
TOPCODER_ENV: process.env.TOPCODER_ENV || 'dev',
Expand Down
2 changes: 1 addition & 1 deletion src/front/src/app/projects/project.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ angular.module('topcoderX')
ProjectService.getTags = function() {
return $http({
method: 'GET',
url: $rootScope.appConfig.TC_API_V4_URL[$rootScope.appConfig.TOPCODER_ENV] + '/technologies,
url: $rootScope.appConfig.TOPCODER_VALUES[$rootScope.appConfig.TOPCODER_ENV].TC_API_V4_URL + '/technologies',
headers: {
"Content-Type": "application/json",
"Authorization": "Bearer " + AuthService.getTokenV3()
Expand Down
3 changes: 0 additions & 3 deletions src/front/src/app/upsertproject/upsertproject.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,7 @@ <h2>{{title}}</h2>
<br />
<br />
<label class="form-label">Tags:</label>
<!-- TODO: care about order or not
<ui-select multiple ng-model="project.tags" theme="bootstrap" close-on-select="false" on-select="$select.selected.sort()">
-->
<ui-select multiple ng-model="project.tags" theme="bootstrap" close-on-select="false">
<ui-select-match placeholder="Select...">
{{$item}}
</ui-select-match>
Expand Down
6 changes: 3 additions & 3 deletions src/services/ProjectService.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ async function _createOrMigrateRepository(repoUrl, project, currentUser) {
);

await createHook({projectId: project.id}, currentUser, repoUrl);

const oldProject = await dbHelper.getById(models.Project, oldRepo.projectId);
return _.isEqual(oldProject.tags, project.tags) ? [] : challengeUUIDs;
}
catch (err) {
throw new Error(`Update ProjectId for Repository, Issue, CopilotPayment failed. Repo ${repoUrl}. Internal Error: ${err}`);
}

const oldProject = await dbHelper.getById(models.Project, oldRepo.projectId);
return _.isEqual(oldProject.tags, project.tags) ? [] : challengeUUIDs;
} else {
try {
await dbHelper.create(models.Repository, {
Expand Down