Skip to content

Commit ba9f200

Browse files
RishiRajSahuRishiRajSahu
authored
Merge pull request #4229 from appirio-tech/dev
Connect 2.15.0
2 parents 71df665 + 715e726 commit ba9f200

File tree

62 files changed

+2862
-736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2862
-736
lines changed

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ copilots take it from there.
1010

1111
## Run locally for development
1212

13-
Prior to running the application locally you should add into your `/etc/hosts` the line `127.0.0.1 local.topcoder-dev.com`.
14-
1513
- `$ npm install` - Installs all dependencies.
1614
- `$ npm start` - Run application in development mode against Topcoder development environment using [dev](https://github.com/appirio-tech/connect-app/blob/dev/config/constants/dev.js) config. In this case the frontend is build in memory by webpack server and uses dev tools like redux-logger.
1715

18-
Open browser with URL http://local.topcoder-dev.com:3000.
16+
Open browser with URL http://localhost:3000.
1917

2018
## NPM commands
2119

‎config/constants/dev.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ module.exports = {
4343
PREDIX_PROGRAM_ID : 3448,
4444
IBM_COGNITIVE_PROGRAM_ID : 3449,
4545
HEAP_ANALYTICS_APP_ID : '4153837120',
46+
PHASE_PRODUCT_TEMPLATE_ID : 176,
4647

4748
TC_NOTIFICATION_URL: 'https://api.topcoder-dev.com/v5/notifications',
4849
CONNECT_MESSAGE_API_URL: 'https://api.topcoder-dev.com/v5',

‎config/constants/master.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ module.exports = {
4343
PREDIX_PROGRAM_ID : 3448,
4444
IBM_COGNITIVE_PROGRAM_ID : 3449,
4545
HEAP_ANALYTICS_APP_ID : '638908330',
46+
PHASE_PRODUCT_TEMPLATE_ID : 67,
4647

4748
TC_NOTIFICATION_URL: 'https://api.topcoder.com/v5/notifications',
4849
CONNECT_MESSAGE_API_URL: 'https://api.topcoder.com/v5',

‎config/constants/qa.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ module.exports = {
4242
PREDIX_PROGRAM_ID : 3448,
4343
IBM_COGNITIVE_PROGRAM_ID : 3449,
4444
HEAP_ANALYTICS_APP_ID : '4153837120',
45+
PHASE_PRODUCT_TEMPLATE_ID : 176,
4546

4647
TC_NOTIFICATION_URL: 'https://api.topcoder-dev.com/v5/notifications',
4748
CONNECT_MESSAGE_API_URL: 'https://api.topcoder-qa.com/v5',

‎docs/LocalSetup.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The message service will be started at 8001 port.
2929
Login to postgres either by install psql locally, or entering the postgres docker container:
3030

3131
```shell
32-
psql messages coder -h local.topcoder-dev.com
32+
psql messages coder -h localhost
3333
```
3434

3535
And execute the following statement:
@@ -46,4 +46,4 @@ INSERT INTO "referenceLookups" (reference, endpoint, "createdAt", "updatedAt") V
4646
CONNECT_MESSAGE_API_URL=http://localhost:8001 npm start
4747
```
4848

49-
The connect app will be started at 3000 port.
49+
The connect app will be started at 3000 port.

‎docs/permissions.html‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,31 @@ <h2 class="anchor-container">
232232
</div>
233233
</div>
234234
</div>
235+
<div class="row border-top">
236+
<div class="col py-2">
237+
<div class="permission-title anchor-container">
238+
<a href="#REMOVE_COPILOTS" name="REMOVE_COPILOTS" class="anchor"></a>Remove Copilots
239+
</div>
240+
<div class="permission-variable"><small><code>REMOVE_COPILOTS</code></small></div>
241+
<div class="text-black-50 small-text">Remove copilots form the project.</div>
242+
</div>
243+
<div class="col-9 py-2">
244+
<div>
245+
<span class="badge badge-primary" title="Allowed Project Role">manager</span>
246+
<span class="badge badge-primary" title="Allowed Project Role">account_manager</span>
247+
<span class="badge badge-primary" title="Allowed Project Role">account_executive</span>
248+
<span class="badge badge-primary" title="Allowed Project Role">project_manager</span>
249+
<span class="badge badge-primary" title="Allowed Project Role">program_manager</span>
250+
<span class="badge badge-primary" title="Allowed Project Role">solution_architect</span>
251+
</div>
252+
253+
<div>
254+
<span class="badge badge-success" title="Allowed Topcoder Role">administrator</span>
255+
<span class="badge badge-success" title="Allowed Topcoder Role">Connect Admin</span>
256+
<span class="badge badge-success" title="Allowed Topcoder Role">Connect Copilot Manager</span>
257+
</div>
258+
</div>
259+
</div>
235260
<div class="row border-top">
236261
<div class="col py-2">
237262
<div class="permission-title anchor-container">
@@ -971,6 +996,30 @@ <h2 class="anchor-container">
971996
</div>
972997
</div>
973998
</div>
999+
<div class="row border-top">
1000+
<div class="col py-2">
1001+
<div class="permission-title anchor-container">
1002+
<a href="#EDIT_PROJECT_STATUS_TO_SPECIAL" name="EDIT_PROJECT_STATUS_TO_SPECIAL" class="anchor"></a>Edit project status to special
1003+
</div>
1004+
<div class="permission-variable"><small><code>EDIT_PROJECT_STATUS_TO_SPECIAL</code></small></div>
1005+
<div class="text-black-50 small-text">Special values are any values except of &quot;Active&quot; and &quot;Completed&quot;.</div>
1006+
</div>
1007+
<div class="col-9 py-2">
1008+
<div>
1009+
<span class="badge badge-primary" title="Allowed Project Role">manager</span>
1010+
<span class="badge badge-primary" title="Allowed Project Role">account_manager</span>
1011+
<span class="badge badge-primary" title="Allowed Project Role">account_executive</span>
1012+
<span class="badge badge-primary" title="Allowed Project Role">project_manager</span>
1013+
<span class="badge badge-primary" title="Allowed Project Role">program_manager</span>
1014+
<span class="badge badge-primary" title="Allowed Project Role">solution_architect</span>
1015+
</div>
1016+
1017+
<div>
1018+
<span class="badge badge-success" title="Allowed Topcoder Role">administrator</span>
1019+
<span class="badge badge-success" title="Allowed Topcoder Role">Connect Admin</span>
1020+
</div>
1021+
</div>
1022+
</div>
9741023
<div class="row border-top">
9751024
<div class="col py-2">
9761025
<div class="permission-title anchor-container">
@@ -1142,6 +1191,12 @@ <h2 class="anchor-container">
11421191
<div class="col-9 py-2">
11431192
<div>
11441193
<span class="badge badge-primary" title="Allowed Project Role">customer</span>
1194+
<span class="badge badge-primary" title="Allowed Project Role">manager</span>
1195+
<span class="badge badge-primary" title="Allowed Project Role">account_manager</span>
1196+
<span class="badge badge-primary" title="Allowed Project Role">account_executive</span>
1197+
<span class="badge badge-primary" title="Allowed Project Role">project_manager</span>
1198+
<span class="badge badge-primary" title="Allowed Project Role">program_manager</span>
1199+
<span class="badge badge-primary" title="Allowed Project Role">solution_architect</span>
11451200
</div>
11461201

11471202
<div>

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.1.0",
44
"description": "Customer pages in React and Redux",
55
"scripts": {
6-
"start": "webpack-dev-server --history-api-fallback --env=development --hot --inline --progress --port 3000 --host 0.0.0.0 --public local.topcoder-dev.com",
6+
"start": "webpack-dev-server --history-api-fallback --env=development --hot --inline --progress --port 3000 --host 0.0.0.0",
77
"build": "npm rebuild node-sass; ./node_modules/.bin/webpack --bail --progress --colors --env=production",
88
"lint": "eslint --format table --ext .js,.jsx .",
99
"lint:fix": "eslint --fix --format table --ext .js,.jsx .",
@@ -150,7 +150,7 @@
150150
"remarkable": "^1.7.4",
151151
"sanitize-html": "^1.27.4",
152152
"svg-react-loader": "^0.4.5",
153-
"tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.3",
153+
"tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4",
154154
"tc-ui": "git+https://github.com/appirio-tech/tc-ui.git#feature/connectv2",
155155
"tlds": "^1.191.0",
156156
"topcoder-react-utils": "0.0.39",

‎src/api/projects.js‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -184,26 +184,6 @@ export function createPhaseProduct(projectId, phaseId, product) {
184184
.then( resp => resp.data)
185185
}
186186

187-
export function createProjectWithStatus(projectProps, status) {
188-
// Phase out discussions
189-
// TODO: Remove this once none of the active projects
190-
// have the discussions tab enabled
191-
projectProps.details.hideDiscussions = true
192-
193-
return axios.post(`${PROJECTS_API_URL}/v5/projects/`, projectProps)
194-
.then( resp => resp.data)
195-
.then(project => {
196-
const updatedProps = { status }
197-
const projectId = project.id
198-
return axios.patch(`${PROJECTS_API_URL}/v5/projects/${projectId}/`, updatedProps)
199-
.then(resp => resp.data)
200-
.catch(error => { // eslint-disable-line no-unused-vars
201-
// return created project even if status update fails to prevent error page
202-
return project
203-
})
204-
})
205-
}
206-
207187
export function deleteProject(projectId) {
208188
return axios.delete(`${PROJECTS_API_URL}/v5/projects/${projectId}/`)
209189
.then(() => {

‎src/components/Layout/Layout.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,5 @@
2222
&[data-route*='new-project'] {
2323
background-color: $tc-gray-neutral-light;
2424
}
25-
&[data-route*='add-phase'] {
26-
background-color: $tc-gray-neutral-light;
27-
}
2825
}
2926
}

‎src/components/ProjectInfo/ProjectInfo.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
width: 52px;
3030
padding-left: 4 * $base-unit;
3131
margin-bottom: 2 * $base-unit;
32-
32+
3333
.spacing {
3434
margin-top: 5 * $base-unit;
3535
}
@@ -69,6 +69,7 @@
6969
padding-right: 4 * $base_unit;
7070
display: flex;
7171
flex-direction: column;
72+
min-width: 0;
7273
}
7374

7475
.project-status-header {
@@ -142,6 +143,7 @@
142143
margin-top: 20px;
143144
text-overflow: ellipsis;
144145
overflow: hidden;
146+
word-wrap: break-word;
145147
}
146148

147149
.project-status-bottom {

0 commit comments

Comments
 (0)