Skip to content

Commit 14eb524

Browse files
jmgasperjmgasper
authored
Merge branch 'feat/v6' into feat/review
2 parents 6d61a18 + 0b3922b commit 14eb524

File tree

14 files changed

+46
-39
lines changed

14 files changed

+46
-39
lines changed

‎.circleci/config.yml‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ install_dependency: &install_dependency
2626
install_deploysuite: &install_deploysuite
2727
name: Installation of install_deploysuite.
2828
command: |
29-
git clone --branch v1.4.13 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
29+
git clone --branch v1.4.17 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
3030
cp ./../buildscript/master_deploy.sh .
3131
cp ./../buildscript/buildenv.sh .
3232
cp ./../buildscript/awsconfiguration.sh .
33+
cp ./../buildscript/psvar-processor.sh .
3334
3435
restore_cache_settings_for_build: &restore_cache_settings_for_build
3536
key: connect-node-modules-{{ checksum "yarn.lock" }}
@@ -48,14 +49,16 @@ running_yarn_eslint: &running_yarn_eslint
4849
running_yarn_build: &running_yarn_build
4950
name: Running Yarn Build
5051
command: |
51-
source buildenvvar
52+
# source buildenvvar
53+
source buildvar_env
5254
yarn install
5355
yarn build
5456
5557
running_yarn_sb_build: &running_yarn_sb_build
5658
name: Running Yarn Storybook Build
5759
command: |
58-
source buildenvvar
60+
# source buildenvvar
61+
source buildvar_env
5962
yarn sb:build
6063
6164
workspace_persist: &workspace_persist
@@ -70,7 +73,9 @@ build_configuration_fetch: &build_configuration_fetch
7073
name: "configuring environment"
7174
command: |
7275
./awsconfiguration.sh $DEPLOY_ENV
73-
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
76+
# ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
77+
./psvar-processor.sh -t appenv -p /config/${APPNAME}/buildvar
78+
source buildvar_env
7479
aws s3 cp s3://tc-platform-${LOGICAL_ENV}/securitymanager/${LOGICAL_ENV}-platform-ui.env ./.environments/.env.${LOGICAL_ENV}.local
7580
7681
lint_steps: &lint_steps # Initialization.
@@ -98,8 +103,10 @@ deploy_steps: &deploy_steps
98103
command: |
99104
./awsconfiguration.sh $DEPLOY_ENV
100105
source awsenvconf
101-
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
102-
source buildenvvar
106+
# ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
107+
# source buildenvvar
108+
./psvar-processor.sh -t appenv -p /config/${APPNAME}/deployvar
109+
source deployvar_env
103110
./master_deploy.sh -d CFRONT -e $DEPLOY_ENV -c $ENABLE_CACHE
104111
105112
jobs:
@@ -132,15 +139,15 @@ jobs:
132139
environment:
133140
DEPLOY_ENV: "QA"
134141
LOGICAL_ENV: "qa"
135-
APPNAME: "platform-ui-mvp"
142+
APPNAME: "platform-ui-mvp-v6"
136143
steps: *build_steps
137144

138145
build-prod:
139146
<<: *defaults
140147
environment:
141148
DEPLOY_ENV: "PROD"
142149
LOGICAL_ENV: "prod"
143-
APPNAME: "platform-ui-mvp"
150+
APPNAME: "platform-ui-mvp-v6"
144151
steps: *build_steps
145152

146153
# Just tests commited code.
@@ -150,7 +157,7 @@ jobs:
150157
DEPLOY_ENV: "DEV"
151158
LOGICAL_ENV: "dev"
152159
ENABLE_CACHE: true
153-
APPNAME: "platform-ui-mvp"
160+
APPNAME: "platform-ui-mvp-v6"
154161
steps: *deploy_steps
155162

156163
deployQa:
@@ -159,7 +166,7 @@ jobs:
159166
DEPLOY_ENV: "QA"
160167
LOGICAL_ENV: "qa"
161168
ENABLE_CACHE: true
162-
APPNAME: "platform-ui-mvp"
169+
APPNAME: "platform-ui-mvp-v6"
163170
steps: *deploy_steps
164171

165172
deployProd:
@@ -168,7 +175,7 @@ jobs:
168175
DEPLOY_ENV: "PROD"
169176
LOGICAL_ENV: "prod"
170177
ENABLE_CACHE: true
171-
APPNAME: "platform-ui-mvp"
178+
APPNAME: "platform-ui-mvp-v6"
172179
steps: *deploy_steps
173180

174181
workflows:
@@ -223,7 +230,7 @@ workflows:
223230
- CORE-635
224231
- feat/review
225232
- feat/system-admin
226-
- pm-1722_1
233+
- feat/v6
227234

228235
- deployQa:
229236
context: org-global

‎src/apps/admin/src/lib/components/ChallengeList/ChallengeList.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const ChallengeCurrentPhase: FC<{ challenge: Challenge }> = props => {
5252

5353
let phaseMessage = 'Stalled'
5454
if (statusPhase) phaseMessage = statusPhase.name
55-
else if (props.challenge.status === 'Draft') phaseMessage = 'In Draft'
55+
else if (props.challenge.status === 'DRAFT') phaseMessage = 'In Draft'
5656

5757
return <>{phaseMessage}</>
5858
}

‎src/apps/admin/src/lib/models/challenge-management/Challenge.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export enum ChallengeStatus {
2-
New = 'New',
3-
Draft = 'Draft',
4-
Active = 'Active',
5-
Completed = 'Completed',
2+
New = 'NEW',
3+
Draft = 'DRAFT',
4+
Active = 'ACTIVE',
5+
Completed = 'COMPLETED',
66
}
77

88
export type ChallengeType = {

‎src/apps/admin/src/lib/services/challenge-management.service.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {
2020
} from '../models'
2121
import { createChallengeQueryString } from '../utils'
2222

23-
const challengeBaseUrl = `${EnvironmentConfig.API.V5}`
24-
const resourceBaseUrl = `${EnvironmentConfig.API.V5}`
25-
const memberBaseUrl = `${EnvironmentConfig.API.V5}`
23+
const challengeBaseUrl = `${EnvironmentConfig.API.V6}`
24+
const resourceBaseUrl = `${EnvironmentConfig.API.V6}`
25+
const memberBaseUrl = `${EnvironmentConfig.API.V6}`
2626

2727
/**
2828
* Searches the challenges using v5 api.

‎src/apps/admin/src/lib/services/groups.service.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const findGroupByMember = async (params: {
2727
membershipType: 'user'
2828
}): Promise<UserGroup[]> => {
2929
const result = await xhrGetAsync<UserGroup[]>(
30-
`${EnvironmentConfig.API.V5}/groups/?${qs.stringify(params)}`,
30+
`${EnvironmentConfig.API.V6}/groups/?${qs.stringify(params)}`,
3131
)
3232
return result.map(adjustUserGroupResponse)
3333
}
@@ -44,7 +44,7 @@ export const findGroupById = async (
4444
): Promise<UserGroup> => {
4545
const fieldsQuery = fields ? `?fields=${fields.join(',')}` : ''
4646
const result = await xhrGetAsync<UserGroup>(
47-
`${EnvironmentConfig.API.V5}/groups/${groupId}${fieldsQuery}`,
47+
`${EnvironmentConfig.API.V6}/groups/${groupId}${fieldsQuery}`,
4848
)
4949
return adjustUserGroupResponse(result)
5050
}
@@ -63,7 +63,7 @@ export const fetchGroupMembers = async (
6363
},
6464
): Promise<UserGroupMember[]> => {
6565
const result = await xhrGetAsync<UserGroupMember[]>(
66-
`${EnvironmentConfig.API.V5}/groups/${groupId}/members?${qs.stringify(
66+
`${EnvironmentConfig.API.V6}/groups/${groupId}/members?${qs.stringify(
6767
params,
6868
)}`,
6969
)
@@ -79,7 +79,7 @@ export const fetchGroups = async (params: {
7979
perPage: number
8080
}): Promise<UserGroup[]> => {
8181
const result = await xhrGetAsync<UserGroup[]>(
82-
`${EnvironmentConfig.API.V5}/groups?${qs.stringify(params)}`,
82+
`${EnvironmentConfig.API.V6}/groups?${qs.stringify(params)}`,
8383
)
8484
return _.orderBy(result.map(adjustUserGroupResponse), ['createdAt'], ['desc'])
8585
}
@@ -92,7 +92,7 @@ export const fetchGroups = async (params: {
9292
/** */
9393
export const createGroup = async (data: FormAddGroup): Promise<UserGroup> => {
9494
const result = await xhrPostAsync<FormAddGroup, UserGroup>(
95-
`${EnvironmentConfig.API.V5}/groups`,
95+
`${EnvironmentConfig.API.V6}/groups`,
9696
data,
9797
)
9898

@@ -127,7 +127,7 @@ export const addGroupMember = async (
127127
membershipType: 'user' | 'group'
128128
},
129129
string
130-
>(`${EnvironmentConfig.API.V5}/groups/${groupId}/members`, entity)
130+
>(`${EnvironmentConfig.API.V6}/groups/${groupId}/members`, entity)
131131
return result
132132
}
133133

@@ -142,7 +142,7 @@ export const removeGroupMember = async (
142142
memberId: number,
143143
): Promise<string> => {
144144
const result = await xhrDeleteAsync<string>(
145-
`${EnvironmentConfig.API.V5}/groups/${groupId}/members/${memberId}`,
145+
`${EnvironmentConfig.API.V6}/groups/${groupId}/members/${memberId}`,
146146
)
147147
return result
148148
}

‎src/apps/admin/src/lib/services/reviews.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const removeReviewSummation = async (
1515
reviewSummationId: string,
1616
): Promise<ApiV5ResponseSuccess> => {
1717
await xhrDeleteAsync<ApiV5ResponseSuccess>(
18-
`${EnvironmentConfig.API.V5}/reviewSummations/${reviewSummationId}`,
18+
`${EnvironmentConfig.API.V6}/reviewSummations/${reviewSummationId}`,
1919
)
2020
return {
2121
success: true,

‎src/apps/admin/src/lib/services/submissions.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const fetchSubmissionsOfChallenge = async (
2727
}
2828

2929
const results = await xhrGetAsync<Submission[]>(
30-
`${EnvironmentConfig.API.V5}/submissions?challengeId=${challengeId}`,
30+
`${EnvironmentConfig.API.V6}/submissions?challengeId=${challengeId}`,
3131
)
3232
return adjustSubmissionsResponse(results)
3333
}
@@ -41,7 +41,7 @@ export const removeSubmission = async (
4141
submissionId: string,
4242
): Promise<ApiV5ResponseSuccess> => {
4343
const result = await xhrDeleteAsync<ApiV5ResponseSuccess>(
44-
`${EnvironmentConfig.API.V5}/submissions/${submissionId}`,
44+
`${EnvironmentConfig.API.V6}/submissions/${submissionId}`,
4545
)
4646
return result
4747
}

‎src/apps/admin/src/lib/services/user.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const getMembersByHandle = async (
5252
})
5353

5454
return xhrGetAsync<Array<MemberInfo>>(
55-
`${EnvironmentConfig.API.V5}/members?fields=userId,handle${qs}`,
55+
`${EnvironmentConfig.API.V6}/members?fields=userId,handle${qs}`,
5656
)
5757
}
5858

‎src/apps/admin/src/platform/gamification-admin/src/game-lib/member-autocomplete/input-handle-functions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ export async function membersAutocompete(term: string): Promise<Array<MembersAut
1919
term,
2020
}
2121

22-
return xhrGetAsync(`${EnvironmentConfig.API.V5}/members/autocomplete?${qs.stringify(query)}`)
22+
return xhrGetAsync(`${EnvironmentConfig.API.V6}/members/autocomplete?${qs.stringify(query)}`)
2323
}

‎src/apps/copilots/src/services/members.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const getMembersByUserIds = async (
3838
})
3939

4040
return xhrGetAsync<Array<{ userId: string }>>(
41-
`${EnvironmentConfig.API.V5}/members?${qs}`,
41+
`${EnvironmentConfig.API.V6}/members?${qs}`,
4242
)
4343
}
4444

@@ -64,7 +64,7 @@ export const useMembers = (userIds: number[]): MembersResponse => {
6464
userIds.forEach(userId => {
6565
qs += `&userIds[]=${userId}`
6666
})
67-
const url = `${EnvironmentConfig.API.V5}/members?${qs}`
67+
const url = `${EnvironmentConfig.API.V6}/members?${qs}`
6868

6969
const fetcher = (urlp: string): Promise<FormattedMembers[]> => xhrGetAsync<FormattedMembers[]>(urlp)
7070
.then(data => membersFactory(data))

0 commit comments

Comments
 (0)