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

Fix part of #5344: Introduce & modify controllers to support multiple classrooms #5419

Merged
merged 89 commits into from
Jun 26, 2024
Merged

Fix part of #5344: Introduce & modify controllers to support multiple classrooms #5419

merged 89 commits into from
Jun 26, 2024

Commits on May 30, 2024

  1. Add ClassroomIdList & ClassroomSummary protos

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    f6b1f60 View commit details
    Browse the repository at this point in the history

  2. Add classroom_id & classroom_title fields

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    fdcf183 View commit details
    Browse the repository at this point in the history

  3. Add json & textproto test data

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a66a5ac View commit details
    Browse the repository at this point in the history

  4. Update controllers to add classroom references in topics and stories

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    b292594 View commit details
    Browse the repository at this point in the history

  5. Add and update tests for controller changes

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    d68d1b5 View commit details
    Browse the repository at this point in the history

  6. Remove ClassroomList model

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    69352df View commit details
    Browse the repository at this point in the history

  7. Fix ktlint issues

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    700a001 View commit details
    Browse the repository at this point in the history

  8. Fix textproto syntax issue

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    9063bcd View commit details
    Browse the repository at this point in the history

  9. Fix textproto syntax issue

    @theMr17
    theMr17 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    8ce636d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. TopicListController is updated to load all topics irrespective of the… 

    … classroom.

IDs of Science & Maths classrooms is interchanged to make the relative ordering of the topics same as previous. This is required by several UI tests to pass.
    @theMr17
    theMr17 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    dbe9842 View commit details
    Browse the repository at this point in the history

  2. Fix failing tests of TopicControllerTest

    @theMr17
    theMr17 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    238d96c View commit details
    Browse the repository at this point in the history

  3. Update test_classroom_id_0.textproto

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    d5a8bc8 View commit details
    Browse the repository at this point in the history

  4. Update test_classroom_id_1.textproto

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    db67666 View commit details
    Browse the repository at this point in the history

  5. Update test_classroom_id_2.textproto

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    405f160 View commit details
    Browse the repository at this point in the history

  6. Add classroom file names in domain assets list

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    ff3444f View commit details
    Browse the repository at this point in the history

  7. Update domain_assets.bzl

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    4c5f322 View commit details
    Browse the repository at this point in the history

  8. Remove classroom thumbnail data from test_classroom_id_0

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    2a26a2b View commit details
    Browse the repository at this point in the history

  9. Remove classroom thumbnail data from test_classroom_id_1

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    c22fead View commit details
    Browse the repository at this point in the history

  10. Remove classroom thumbnail data from test_classroom_id_2

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    6cb9146 View commit details
    Browse the repository at this point in the history

  11. Fix bazel lint issue

    @theMr17
    theMr17 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    b214206 View commit details
    Browse the repository at this point in the history

  12. Introduce topic_ids field for classrooms

    @theMr17
    theMr17 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    884a675 View commit details
    Browse the repository at this point in the history

  13. Fix textproto formatting issue

    @theMr17
    theMr17 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    9fbfda3 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Introduce ClassroomController to surface getClassroomList function

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    0ee6828 View commit details
    Browse the repository at this point in the history

  2. Add tests for getClassroomList function

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    1954d60 View commit details
    Browse the repository at this point in the history

  3. Fix ktlint issues

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    0d39117 View commit details
    Browse the repository at this point in the history

  4. Add kdoc for getClassroomList function

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    4e0335f View commit details
    Browse the repository at this point in the history

  5. Add getTopicList to ClassroomController

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    a31850f View commit details
    Browse the repository at this point in the history

  6. Add tests for getTopicList function

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    ae1b072 View commit details
    Browse the repository at this point in the history

  7. Fix tests

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    ea5e65e View commit details
    Browse the repository at this point in the history

  8. Fix ktlint issues

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    714f57d View commit details
    Browse the repository at this point in the history

  9. Fix tests

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    e90f4d2 View commit details
    Browse the repository at this point in the history

  10. Move test classroom id constants to ClassroomController

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    637b704 View commit details
    Browse the repository at this point in the history

  11. Add missing import

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    008a233 View commit details
    Browse the repository at this point in the history

  12. Gate the createTopicList function

    @theMr17
    theMr17 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    e3dbfde View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Fix tests

    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    9bec9d6 View commit details
    Browse the repository at this point in the history

  2. Add kdoc for test classroom id constants

    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    4ceece2 View commit details
    Browse the repository at this point in the history

  3. Update ProfileManagementController to store last selected classroom I… 

    …D and add tests
    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    a89b8a7 View commit details
    Browse the repository at this point in the history

  4. Temporarily hard code default classroom ID in ProfileManagementContro… 

    …ller
    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    49ae0a4 View commit details
    Browse the repository at this point in the history

  5. Return nullable classroom ID from ProfileManagementController 

    The empty classroom ID will be handled in the app level, instead of handling it in the domain level.
    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    e957499 View commit details
    Browse the repository at this point in the history

  6. Update checkProfile test

    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    6584fe7 View commit details
    Browse the repository at this point in the history

  7. Remove getTopicList function from TopicListController

    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    48921d5 View commit details
    Browse the repository at this point in the history

  8. Remove unused imports from TopicListController

    @theMr17
    theMr17 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    52c5b13 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Revert "Remove unused imports from TopicListController" 

    This reverts commit 52c5b13
    @theMr17
    theMr17 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    74e4edf View commit details
    Browse the repository at this point in the history

  2. Revert "Remove getTopicList function from TopicListController" 

    This reverts commit 48921d5
    @theMr17
    theMr17 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    baea849 View commit details
    Browse the repository at this point in the history

  3. Revert "Gate the createTopicList function" 

    This reverts commit e3dbfde
    @theMr17
    theMr17 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    cb96baf View commit details
    Browse the repository at this point in the history

  4. Remove translationLocaleProvider from getClassroomList

    @theMr17
    theMr17 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2c894e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Add EphemeralClassroomSummary & ClassroomList objects

    @theMr17
    theMr17 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    e1c9254 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/multiple-classrooms-model-supp… 

    …ort' into multiple-classrooms-domain-support
    @theMr17
    theMr17 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1b3b02e View commit details
    Browse the repository at this point in the history

  3. Replace List<ClassroomSummary> with ClassroomList

    @theMr17
    theMr17 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a226a72 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Remove classroom info from CompletedStory

    @theMr17
    theMr17 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c82994e View commit details
    Browse the repository at this point in the history

  2. Fix error message

    @theMr17
    theMr17 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    2649461 View commit details
    Browse the repository at this point in the history

  3. Update comments

    @theMr17
    theMr17 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    857d296 View commit details
    Browse the repository at this point in the history

  4. Revert "Introduce topic_ids field for classrooms" 

    This reverts commit 884a675
    @theMr17
    theMr17 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    693bfe8 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Add test thumbnails

    @theMr17
    theMr17 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    a0bf50c View commit details
    Browse the repository at this point in the history

  2. Refactor topicIdsList to use keys of topicPrerequisitesMay

    @theMr17
    theMr17 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    c9ae332 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/multiple-classrooms-model-supp… 

    …ort' into multiple-classrooms-domain-support
    @theMr17
    theMr17 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    5f1fa81 View commit details
    Browse the repository at this point in the history

  4. Fix kdoc checks

    @theMr17
    theMr17 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    81a89a3 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Pass classroomId to createTopicList directly

    @theMr17
    theMr17 committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    d438cb5 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Update kdoc comments

    @theMr17
    theMr17 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4de2222 View commit details
    Browse the repository at this point in the history

  2. Update variable name

    @theMr17
    theMr17 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    223f217 View commit details
    Browse the repository at this point in the history

  3. Update kdoc and return default instances

    @theMr17
    theMr17 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    e6bd04b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into multiple-classrooms-model-support

    @theMr17
    theMr17 authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4b3d596 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/multiple-classrooms-model-supp… 

    …ort' into multiple-classrooms-domain-support
    @theMr17
    theMr17 committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    2baca12 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Remove extra new line

    @theMr17
    theMr17 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    73fb79e View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Move classroom titles to ephemeral objects and pass the class written… 

    … translation contexts
    @theMr17
    theMr17 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    2432150 View commit details
    Browse the repository at this point in the history

  2. Remove classroom title from topic data files

    @theMr17
    theMr17 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    d2a454d View commit details
    Browse the repository at this point in the history

  3. Fix regex validation checks

    @theMr17
    theMr17 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ac24de1 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Handle empty classroom id when the proto asset is overridden for tests

    @theMr17
    theMr17 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    6cf8ae4 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Remove classroom ID from topic data files

    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    3d91ac2 View commit details
    Browse the repository at this point in the history

  2. Remove unused import & variable

    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    8296e2e View commit details
    Browse the repository at this point in the history

  3. Fetch classroom ID from topic ID

    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    8c5a77b View commit details
    Browse the repository at this point in the history

  4. Update left out classroom ID fetching

    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    37dc6a3 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/multiple-classrooms-model-supp… 

    …ort' into multiple-classrooms-domain-support
    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    8d5f678 View commit details
    Browse the repository at this point in the history

  6. Update ClassroomController per latest changes in model layer

    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    b149154 View commit details
    Browse the repository at this point in the history

  7. Fix ktlint check

    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    b694868 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into multiple-classrooms-model-support

    @theMr17
    theMr17 authored Jun 20, 2024
    Configuration menu
    Copy the full SHA
    9a328e5 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/multiple-classrooms-model-supp… 

    …ort' into multiple-classrooms-domain-support
    @theMr17
    theMr17 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    0994300 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. Remove empty classroom from the list

    @theMr17
    theMr17 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    8b902eb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into multiple-classrooms-model-support

    @theMr17
    theMr17 authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    74c29af View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/multiple-classrooms-model-supp… 

    …ort' into multiple-classrooms-domain-support
    @theMr17
    theMr17 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    ff884f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge branch 'develop' into multiple-classrooms-domain-support

    @theMr17
    theMr17 authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    2e3d2f0 View commit details
    Browse the repository at this point in the history

  2. Fix classroom filtering logic for textproto

    @theMr17
    theMr17 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    3f02092 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Simplify isNotNullOrEmpty check

    @theMr17
    theMr17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    0f4e98b View commit details
    Browse the repository at this point in the history

  2. Rename to createClassroomSummaryFromJson function

    @theMr17
    theMr17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    f0134fb View commit details
    Browse the repository at this point in the history

  3. Split createClassroomList function

    @theMr17
    theMr17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    24eed39 View commit details
    Browse the repository at this point in the history

  4. Add test for updating classroomId twice

    @theMr17
    theMr17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    2dc399b View commit details
    Browse the repository at this point in the history

  5. Remove fetching of TopicSummary from getTopicIdListFromClassroomRecord

    @theMr17
    theMr17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    273caf2 View commit details
    Browse the repository at this point in the history

  6. Revert "Add test for updating classroomId twice" 

    This reverts commit 2dc399b
    @theMr17
    theMr17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    afd7251 View commit details
    Browse the repository at this point in the history

  7. Add test for updating classroomId twice

    @theMr17
    theMr17 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    b4d6bd5 View commit details
    Browse the repository at this point in the history