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

OD-18791_Usyd_search_expansion_project_stage_2_rebased #1221

Merged
merged 99 commits into from
May 2, 2024
Merged

OD-18791_Usyd_search_expansion_project_stage_2_rebased #1221

merged 99 commits into from
May 2, 2024

Conversation

yuryyas
Copy link
Collaborator

@yuryyas yuryyas commented Mar 25, 2024

No description provided.

dmitars and others added 30 commits March 6, 2024 16:21
@dmitars
OD-18800 feat: support for new tags types on server side
5c191c2
@dmitars
OD-18800 feat: replace specific tag type with additional special node…
af989d5 
… types
@dmitars
OD-18800 feat: add check for hidden tag names
029fa4c
@dmitars
OD-18800 feat: add ability to create tags with special types on clien…
95fe9a0 
…t; returned special type
@dmitars
OD-18800 feat: add check that only one root tag with specific type ma…
a0ad215 
…y exist
@dmitars
OD-18800 feat: new endpoint to remove tags with special types; some r…
12fd4f9 
…efactoring
@dmitars
OD-18800 fix: add check if tag doesn't have special tag type
1728883
@yuryyas @dmitars
OD-18805 Added Class types and Course types forms basic ui and logic
371fb6f
@dmitars
OD-18800 feat: remove root tag from special tags requests
c01ee7a
@dmitars
OD-18800 refactor: split api functions between classes
0551824
@yuryyas @dmitars
OD-18800 Adjusted client due to api model changes
902fa5d
@yuryyas @dmitars
OD-18800 Implemented delete, create and update endpoints
852f029
@dmitars
OD-18800 fix: update special tags endpoint
5fa516b
@dmitars
OD-18800 fix: name of error field in validation
eb0176b
@dmitars
OD-18800 fix: validation of special tag types
f98c399
@dmitars
OD-18800 fix: creating of a new root tag
00bedea
@dmitars
OD-18800 fix: replace specialType tag field with property in separate…
89598e3 
… special tag model
@dmitars
OD-18800 fix: special type check
518a62b
@yuryyas @dmitars
OD-18800, OD-18805 Added type inputs for course and class
d9adaa4
@yuryyas @dmitars
OD-18800, OD-18805 Extended common search select filtering to allow e…
83dd752 
…mpty search with additional AQL
@dmitars
OD-18800 feat: remove weight validation, because we have default valu…
64ab304 
…e in tag creation
@dmitars
OD-18800 feat: exclude special parent tags from plain requests on ent…
a677b80 
…ity lists
@yuryyas @dmitars
OD-18800, OD-18805 Adjusted GET endpoint data resolving
fdc4fdd
@dmitars
OD-18800 fix: api models in accordance with single special tag per en…
5ed4e22 
…tity
@yuryyas @dmitars
OD-18800, OD-18805 Adjusted special types UI and api handlers due to …
f78e5e6 
…schema changes
@dmitars
OD-18800 feat: sort of special tag names by their name to make respon…
121fffc 
…se stable
@dmitars
OD-18800 feat: tests for new special tags endpoints
0f958f4
@GFilipovich
Merge branch 'main' into OD-18791_Usyd_search_expansion_project
d43fc0a
@dmitars
OD-18799 feat: add new property for specific subjects display as a pr…
b20b385 
…eference, placed in .yml file
@dmitars
OD-18799 feat: add check if property not set
ddf0f2b
yuryyas and others added 2 commits March 22, 2024 14:09
@yuryyas
Merge remote-tracking branch 'origin/OD-18791_Usyd_search_expansion_p…
ab8bca2 
…roject' into OD-18791_Usyd_search_expansion_project_stage_2_rebased
@dmitars
Merge branch 'main' into OD-18791_Usyd_search_expansion_project_stage…
c77e875 
…_2_rebased

# Conflicts:
#	api-test/src/test/resources/test-dataset.xml
#	client-html/src/js/containers/entities/courses/components/CourseGeneralTab.tsx
#	server/src/main/groovy/ish/oncourse/server/api/service/CourseApiService.groovy
#	server/src/main/groovy/ish/oncourse/server/api/v1/function/TagRequirementFunctions.groovy
#	types/src/main/groovy/ish/common/types/KeyCode.groovy
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 25, 2024 •
edited
Loading

Unit Test Results

241 tests   241 ✔️  28m 44s ⏱️
240 suites      0 💤
    1 files        0 ❌

Results for commit d53f116.

♻️ This comment has been updated with latest results.

yuryyas and others added 10 commits March 25, 2024 17:48
@yuryyas
OD-18799 Added Subjects entity base UI and logic
809f21e
@yuryyas
OD-18799 Added Subjects entity API handlers
fecd8f7
@yuryyas
Merge remote-tracking branch 'origin/main' into OD-18791_Usyd_search_…
b5a08ca 
…expansion_project_stage_2_rebased

# Conflicts:
#	client-html/src/js/containers/entities/courses/components/CourseGeneralTab.tsx
#	client-html/src/js/containers/entities/modules/components/ModulesEditView.tsx
@dlitvinko
OD-18793 Add replication support for Faculty and relationships of doc…
72a4455 
…ument and tags
@yuryyas
OD-18799 Added Course Subjects input ui and logic
b7e4d18
@dmitars
OD-18799 feat: extend of subjects only if preference was set
2e0b858
@dmitars
OD-18799 fix: preference controller
28db011
@dmitars
OD-18799 feat: deny access to subjects tag by id if preferense is set
a05a7e9
@yuryyas
OD-18799 Added Subjects form field and logic. Moved Subjects list fil…
09a2925 
…ters to separate group
@KeyrisXdSnow
OD-18796 Make Credit Points visible on the website
7c6b7ca
@yuryyas yuryyas requested a review from ari as a code owner April 11, 2024 17:40
GFilipovich and others added 11 commits April 15, 2024 01:07
@GFilipovich
Merge branch 'main' into OD-18791_Usyd_search_expansion_project_stage…
b89a362 
…_2_rebased
@dmitars
OD-18791 fix: tests in accordance with new PreferenceController inter…
e8c4299 
…face
@dmitars
Revert "OD-18799 feat: deny access to subjects tag by id if preferens…
16b8475 
…e is set"

This reverts commit a05a7e9.
@yuryyas
OD-18961 Fixed spelling
cdb9cdd
@yuryyas
OD-18962 Fixed empty AQL processing for plain search preload
7840e2b
@yuryyas
OD-18962 Fixed Portal subdomain field filtering
75869b4
@yuryyas
OD-18962 Adjusted bulk edit fields processing for Portal subdomain
ad94ed4
@yuryyas
OD-18793 Allow faculty removal
07b3bf7
@dmitars
OD-18791 feat: add new necessary fields for modules to test data sets
ab7578d
@dmitars
OD-18791 fix: tests, add ability to change extended types preference …
db17d55 
…using api to use both states in tests
@yuryyas
Fix failing tests
d53f116
@GFilipovich GFilipovich added the test-pass Manual testing passed label May 2, 2024
@GFilipovich GFilipovich self-requested a review May 2, 2024 07:16
@GFilipovich GFilipovich merged commit 29802bc into main May 2, 2024
5 of 6 checks passed
@GFilipovich GFilipovich deleted the OD-18791_Usyd_search_expansion_project_stage_2_rebased branch May 2, 2024 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GFilipovich GFilipovich GFilipovich approved these changes

@ari ari Awaiting requested review from ari

Assignees
No one assigned
Labels
test-pass Manual testing passed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@yuryyas @GFilipovich @dmitars @dlitvinko @KeyrisXdSnow