Commit 8ce22e1

committed

feat(mr): activities.

1 parent 2b188e0 commit 8ce22e1Copy full SHA for 8ce22e1

File tree

+13

-9

lines changed

+13

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export async function activate(context: vscode.ExtensionContext) {`
`58`	`58`	`});`
`59`	`59`	`});`
`60`	`60`	`codingSrv.getMRActivities(mr.iid).then((activityResp) => {`
`61`		- Panel.currentPanel?.broadcast(`mr.update.activities`, activityResp.data);
	`61`	+ Panel.currentPanel?.broadcast(`mr.activities.init`, activityResp.data);
`62`	`62`	`});`
`63`	`63`	`codingSrv.getMRReviewers(mr.iid).then((reviewerResp) => {`
`64`	`64`	Panel.currentPanel?.broadcast(`mr.reviewers.init`, reviewerResp.data);

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { actions } from 'webviews/store/constants';`
`5`	`5`	`export default function messageTransferHook() {`
`6`	`6`	`useEffect(() => {`
`7`	`7`	`window.addEventListener('message', (ev) => {`
`8`		`- const { updateCurrentMR, toggleMRLoading, initMRReviewers } = appStore;`
	`8`	`+ const { updateCurrentMR, toggleMRLoading, initMRReviewers, initMRActivities } = appStore;`
`9`	`9`	`const { command, res } = ev?.data;`
`10`	`10`
`11`	`11`	`switch (command) {`
`@@ -21,6 +21,10 @@ export default function messageTransferHook() {`
`21`	`21`	`initMRReviewers(res);`
`22`	`22`	`break;`
`23`	`23`	`}`
	`24`	`+ case actions.MR_ACTIVITIES_INIT: {`
	`25`	`+ initMRActivities(res);`
	`26`	`+ break;`
	`27`	`+ }`
`24`	`28`	`default:`
`25`	`29`	`break;`
`26`	`30`	`}`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ const appStore = store({`
`115`	`115`	`args: { iid, list },`
`116`	`116`	`});`
`117`	`117`	`appStore.reviewers = resp;`
`118`		`- return;`
	`118`	`+ appStore.refreshMRActivities();`
`119`	`119`	`},`
`120`	`120`	`toggleUpdatingDesc(status?: boolean) {`
`121`	`121`	if (typeof status === `undefined`) {
`@@ -141,22 +141,22 @@ const appStore = store({`
`141`	`141`	`appStore.currentMR.data.merge_request.body = resp.body;`
`142`	`142`	`appStore.currentMR.data.merge_request.body_plan = resp.body_plan;`
`143`	`143`	`appStore.toggleUpdatingDesc(false);`
	`144`	`+ appStore.refreshMRActivities();`
`144`	`145`	`},`
`145`	`146`	`addComment(comment: IComment) {`
`146`	`147`	`appStore.comments.push(comment);`
`147`	`148`	`},`
`148`	`149`	`initMRReviewers(list: IMRReviewers) {`
`149`	`150`	`appStore.reviewers = list;`
`150`	`151`	`},`
	`152`	`+ initMRActivities(data: IActivity[]) {`
	`153`	`+ appStore.updateMRActivities(data);`
	`154`	`+ },`
`151`	`155`	`messageHandler(message: any) {`
`152`		`- const { updateMRActivities,updateMRComments } = appStore;`
	`156`	`+ const { updateMRComments } = appStore;`
`153`	`157`	`const { command, res } = message;`
`154`	`158`
`155`	`159`	`switch (command) {`
`156`		`- case actions.UPDATE_MR_ACTIVITIES: {`
`157`		`- updateMRActivities(res);`
`158`		`- break;`
`159`		`- }`
`160`	`160`	`case actions.MR_UPDATE_COMMENTS: {`
`161`	`161`	`updateMRComments(res);`
`162`	`162`	`break;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`export enum actions {`
`2`	`2`	UPDATE_CURRENT_MR = `mr.update`,
`3`		- UPDATE_MR_ACTIVITIES = `mr.update.activities`,
`4`	`3`	CLOSE_MR = `mr.close`,
`5`	`4`	MR_APPROVE = `mr.approve`,
`6`	`5`	MR_DISAPPROVE = `mr.disapprove`,
`@@ -13,4 +12,5 @@ export enum actions {`
`13`	`12`	MR_UPDATE_REVIEWERS = `mr.update.reviewers`,
`14`	`13`	MR_UPDATE_DESC = `mr.update.desc`,
`15`	`14`	MR_REVIEWERS_INIT = `mr.reviewers.init`,
	`15`	+ MR_ACTIVITIES_INIT = `mr.activities.init`,
`16`	`16`	`}`

Comments

(0)