Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[EASI-3131] [EASI-3129] Threaded Discussions #703

Merged
merged 12 commits into from
Sep 29, 2023
Merged

[EASI-3131] [EASI-3129] Threaded Discussions #703

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
014d00c
feat: removed resolutions from discussion replies for threaded discus…
OddTomBrooks Sep 19, 2023
5242051
feat: removed discussion status from various front-end files
OddTomBrooks Sep 19, 2023
237f699
fix: updated function call in broken test
OddTomBrooks Sep 20, 2023
28c757a
Merge branch 'main' into feature/EASI-3131_threaded_replies
ClayBenson94 Sep 20, 2023
5769868
Merge branch 'main' into feature/EASI-3131_threaded_replies
ClayBenson94 Sep 20, 2023
9dbe681
feat: removed discussion status from go and sql
OddTomBrooks Sep 21, 2023
fd4db24
Merge branch 'feature/EASI-3131_threaded_replies' of github.com:CMSgo…
OddTomBrooks Sep 21, 2023
58f40be
chore: removed references to discussion status from plan discussion sql
OddTomBrooks Sep 25, 2023
15bec22
[EASI-3129] FE -- threaded replies (#719)
garyjzhao Sep 28, 2023
27d5e26
Merge main
ClayBenson94 Sep 28, 2023
5daef7d
Fix conflicts in postman collection
ClayBenson94 Sep 28, 2023
2fb5431
chore: updated postman collection
OddTomBrooks Sep 29, 2023
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
2 changes: 2 additions & 0 deletions migrations/V104__Drop_Discussion_Resolutions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE discussion_reply
DROP COLUMN resolution;
183 changes: 1 addition & 182 deletions pkg/graph/generated/generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/graph/model/models_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/graph/resolvers/access_control_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (suite *ResolverSuite) TestErrorIfNotCollaborator() {

// Create discussion and reply
discussion := suite.createPlanDiscussion(plan, "This is a test comment")
reply := suite.createDiscussionReply(discussion, "This is a test reply", false)
reply := suite.createDiscussionReply(discussion, "This is a test reply")

//5. User is collaborator by discusionID
err = accesscontrol.ErrorIfNotCollaborator(reply, suite.testConfigs.Logger, basicUserPrincipal, suite.testConfigs.Store)
Expand Down
1 change: 0 additions & 1 deletion pkg/graph/resolvers/auditing_paradigm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ func (suite *ResolverSuite) TestDeletionActorAccuracy() {
input := &model.DiscussionReplyCreateInput{
DiscussionID: discussion.ID,
Content: "this is a test reply",
Resolution: false,
UserRole: models.DiscussionUserRolePointer(models.DiscussionRoleNoneOfTheAbove),
UserRoleDescription: models.StringPointer("this is a test"),
}
Expand Down
Loading
Loading