Sept 1, 2026 my profile app - #334
Merged
Merged
Conversation
Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com> # Conflicts: # my_egeria/my_egeria/DemoCode/My_Profile/my_profile_app.py
…my absence for a couple of days Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…e files Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com> # Conflicts: # my_egeria/my_egeria/DemoCode/My_Profile/my_profile_app.py
… and add comments attached to a community Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…file_app and associated files Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…app.py file Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…eens into category files Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
… considating excess forks Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
Salvaged from f32d841 on feature/profile-updates-and-comments, the only commit on that branch not already present in upstream/main. The rest of that branch (178 commits) is already upstream, so the branch is being retired. Only the documentation file is taken here; the commit's changes to my_profile_app.py and shop_for_data_handler.py are superseded by the upstream merge that follows. Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
main and upstream/main had each restructured the profile app differently. upstream carries the mixin split (my_profile_app.py at ~574 lines, behaviour in *_handler.py modules) which originated on this fork and landed upstream as bc82649. This fork's main never received it and was still the 2467-line monolith with the Aug 23-26 feature work on top. The upcoming merge resolves every conflicting app file in favour of upstream's modular version. These copies preserve the Aug 23-26 work in a form that is easy to diff against, so it can be ported into the mixins deliberately rather than reconciled under merge pressure. See the folder README for the specific methods still to port. Full pre-merge state also lives on backup/main-pre-sync-2026-08-26 and tag pre-upstream-sync-2026-08-26. Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…cture Brings in 250 commits from odpi/egeria-python. main had drifted since c5320de and carried 11 local commits of profile-app work. Conflict resolution -- upstream's modular profile app wins throughout: My_Profile/my_profile_app.py <- upstream (574 lines, mixin-based) My_Profile/EditElementsScreens.py <- upstream My_Profile/MainScreen.py <- upstream My_Profile/ShowCommentsScreen.py <- upstream My_Profile/TechnologyTypeScreens.py <- upstream Deprecated/EditCommunitiesScreen.py <- upstream (real 4210B version; the merge's stage-3 blob was the EditBlogsScreen content, crossed wires from rename/rename detection) Deprecated/EditBlogsScreen.py <- identical blob both sides, false conflict from the same rename pair My_Profile/EditCommunitiesScreen.py <- removed; renamed away on both sides uv.lock <- upstream, then regenerated Also removed My_Profile/Add_to_Elements_Screens.py, a divergent duplicate of upstream's AddToElementsScreens.py under a different name. Nothing imported it; the app, elements_crud_handler.py and two test files all import upstream's. The Aug 23-26 feature work that lived inside the conflicted files is NOT lost and NOT yet ported: it is preserved verbatim under my_egeria/my_egeria/DemoCode/My_Profile_parked_aug26/ with a README listing the specific methods still to move into ElementsCrudMixin and TeamRolesMixin. Full pre-merge state is on backup/main-pre-sync-2026-08-26 and tag pre-upstream-sync-2026-08-26. Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
uv lock --check reported the merged lockfile as stale against pyproject.toml. Regenerated rather than hand-merged. Sole change is the pyegeria version bump picked up from upstream (6.1.1 -> 6.1.2); no dependency set changes. refresh_specs was also run: pyegeria/view/base_report_formats.py regenerates byte-identical to the merge result, so no commit needed there. validate_compact_specs passes with 0 errors (29 pre-existing upstream warnings, specs byte-identical to upstream). Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…r shopping for data, and new functionality for listing a users Subscriptions from the main screen, added unit tests as well Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…ta flows and associated test suite Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
…ltiple functional and screen files, show function to see a small sample of a particular data product should be working now Signed-off-by: Peter Coldicott <86156876+pcoldico@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge of 19 commits into main