Skip to content

Conversation

@annapurna-gupta
Copy link
Collaborator

Purpose of PR?:

Fixes #2904

annapurna-gupta and others added 4 commits October 2, 2025 10:22
Save view settings on application close  for top, side, linear, and table for flight tracks
Implemented restoring of views logic and added a test to cover the functionality.
…-MSS#2861)

* Add function to save and restore view settings for an operation in database


---------

Co-authored-by: Matthias Riße <9308656+matrss@users.noreply.github.com>
…pen-MSS#2893)

Adds functionality to share custom views between operation members. Includes a 'Manage Views' widget allowing users to browse and apply shared views, as well as options for renaming views before sharing.  Addresses the need for collaborative view configurations within an operation.
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comments

@ReimarBauer
Copy link
Member

We need to rebase the branch with develop

annapurna-gupta and others added 4 commits January 2, 2026 09:31
Save view settings on application close  for top, side, linear, and table for flight tracks
Implemented restoring of views logic and added a test to cover the functionality.
…-MSS#2861)

* Add function to save and restore view settings for an operation in database


---------

Co-authored-by: Matthias Riße <9308656+matrss@users.noreply.github.com>
…pen-MSS#2893)

Adds functionality to share custom views between operation members. Includes a 'Manage Views' widget allowing users to browse and apply shared views, as well as options for renaming views before sharing.  Addresses the need for collaborative view configurations within an operation.
* Reorder SharedView __init__ params

* Enable CI for prepare** branches
@ReimarBauer ReimarBauer force-pushed the prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta branch from cc3b7ec to 54760e0 Compare January 2, 2026 08:32
…into View-Layout-and-Restoring-documentation
@annapurna-gupta
Copy link
Collaborator Author

@ReimarBauer prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta does not have few old commit.

@ReimarBauer
Copy link
Member

@ReimarBauer prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta does not have few old commit.

on my rebase there was no merge conflict. I do a comparison and add them again.

@annapurna-gupta
Copy link
Collaborator Author

@ReimarBauer prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta does not have few old commit.

on my rebase there was no merge conflict. I do a comparison and add them again.

okk sure!!

@ReimarBauer
Copy link
Member

ReimarBauer commented Jan 2, 2026

@ReimarBauer prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta does not have few old commit.

on my rebase there was no merge conflict. I do a comparison and add them again.

okk sure!!

looking with git log --all.

we can run git cherry-pick <hash>

Do you have identified already some missing?

@annapurna-gupta
Copy link
Collaborator Author

@ReimarBauer prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta does not have few old commit.

on my rebase there was no merge conflict. I do a comparison and add them again.

okk sure!!

looking with git log --all.

we can run git cherry-pick <hash>

Do you have identified already some missing?

image

look at the top 3 commits, they are not from this pr

@ReimarBauer
Copy link
Member

ReimarBauer commented Jan 2, 2026

look at the top 3 commits, they are not from this pr

Have you done yourself a merge or a rebase?

We don't see in this PR any other change, so I assume the changes are aready included.

I compared the commit messages and looked up the git log. They are in, with the right date compared to dervelop.

commit dd6a1a6c8a810c8a54f5b08fdd4bb694c8339e9f
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Aug 5 22:11:46 2025 +0530

    Save view settings on exit to view_settings.json (#2831)

    Save view settings on application close  for top, side, linear, and table for flight tracks
    Implemented restoring of views logic and added a test to cover the functionality.
commit e9145f9b841382ecf2b266fe0723831907dbee3a
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Sep 16 21:26:31 2025 +0530

    Add function to save view settings for an operation in database (#2861)

    * Add function to save and restore view settings for an operation in database


    ---------

    Co-authored-by: Matthias Riße <9308656+matrss@users.noreply.github.com>

commit 5cff1a9ce19036519f129c77b198dae56dd00abe
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Mon Sep 29 16:03:24 2025 +0530

    Feat: Implement view sharing in operations with Manage Views widget (#2893)

    Adds functionality to share custom views between operation members. Includes a 'Manage Views' widget allowing users to browse and apply shared views, as well as options for renaming views before sharing.  Addresses the need for collaborative view configurations within an operation.

When something would be missing you would see this also in "Files Changed" But there only the two changed.
I assume this comes from a merge instead a rebase.

@annapurna-gupta
Copy link
Collaborator Author

annapurna-gupta commented Jan 2, 2026

look at the top 3 commits, they are not from this pr

Have you done yourself a merge or a rebase?

We don't see in this PR any other change, so I assume the changes are aready included.

I compared the commit messages and looked up the git log. They are in, with the right date compared to dervelop.

commit dd6a1a6c8a810c8a54f5b08fdd4bb694c8339e9f
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Aug 5 22:11:46 2025 +0530

    Save view settings on exit to view_settings.json (#2831)

    Save view settings on application close  for top, side, linear, and table for flight tracks
    Implemented restoring of views logic and added a test to cover the functionality.
commit e9145f9b841382ecf2b266fe0723831907dbee3a
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Sep 16 21:26:31 2025 +0530

    Add function to save view settings for an operation in database (#2861)

    * Add function to save and restore view settings for an operation in database


    ---------

    Co-authored-by: Matthias Riße <9308656+matrss@users.noreply.github.com>
commit 5cff1a9ce19036519f129c77b198dae56dd00abe
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Mon Sep 29 16:03:24 2025 +0530

    Feat: Implement view sharing in operations with Manage Views widget (#2893)

    Adds functionality to share custom views between operation members. Includes a 'Manage Views' widget allowing users to browse and apply shared views, as well as options for renaming views before sharing.  Addresses the need for collaborative view configurations within an operation.

When something would be missing you would see this also in "Files Changed" But there only the two changed. I assume this comes from a merge instead a rebase.

I rebased the branch into develop.

@ReimarBauer
Copy link
Member

ReimarBauer commented Jan 2, 2026

look at the top 3 commits, they are not from this pr

Have you done yourself a merge or a rebase?
We don't see in this PR any other change, so I assume the changes are aready included.
I compared the commit messages and looked up the git log. They are in, with the right date compared to dervelop.

commit dd6a1a6c8a810c8a54f5b08fdd4bb694c8339e9f
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Aug 5 22:11:46 2025 +0530

    Save view settings on exit to view_settings.json (#2831)

    Save view settings on application close  for top, side, linear, and table for flight tracks
    Implemented restoring of views logic and added a test to cover the functionality.
commit e9145f9b841382ecf2b266fe0723831907dbee3a
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Sep 16 21:26:31 2025 +0530

    Add function to save view settings for an operation in database (#2861)

    * Add function to save and restore view settings for an operation in database


    ---------

    Co-authored-by: Matthias Riße <9308656+matrss@users.noreply.github.com>
commit 5cff1a9ce19036519f129c77b198dae56dd00abe
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Mon Sep 29 16:03:24 2025 +0530

    Feat: Implement view sharing in operations with Manage Views widget (#2893)

    Adds functionality to share custom views between operation members. Includes a 'Manage Views' widget allowing users to browse and apply shared views, as well as options for renaming views before sharing.  Addresses the need for collaborative view configurations within an operation.

When something would be missing you would see this also in "Files Changed" But there only the two changed. I assume this comes from a merge instead a rebase.

I rebased the branch onto develop.

The commit messages in question have been added on Commits on Oct 2, 2025

Your https://github.com/annapurna-gupta/MSS/tree/prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta
is shown to me as

This branch is [24 commits ahead of](https://github.com/annapurna-gupta/MSS/compare/Open-MSS%3AMSS%3Aprepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta...prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta) 

and [29 commits behind](https://github.com/annapurna-gupta/MSS/compare/prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta...Open-MSS%3AMSS%3Aprepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta) Open-MSS/MSS:prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta.

and in yours you also find the changes from Commits on Oct 2, 2025

Bildschirmfoto 2026-01-02 um 15 47 51

Please sync it too.

@annapurna-gupta
Copy link
Collaborator Author

look at the top 3 commits, they are not from this pr

Have you done yourself a merge or a rebase?
We don't see in this PR any other change, so I assume the changes are aready included.
I compared the commit messages and looked up the git log. They are in, with the right date compared to dervelop.

commit dd6a1a6c8a810c8a54f5b08fdd4bb694c8339e9f
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Aug 5 22:11:46 2025 +0530

    Save view settings on exit to view_settings.json (#2831)

    Save view settings on application close  for top, side, linear, and table for flight tracks
    Implemented restoring of views logic and added a test to cover the functionality.
commit e9145f9b841382ecf2b266fe0723831907dbee3a
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Tue Sep 16 21:26:31 2025 +0530

    Add function to save view settings for an operation in database (#2861)

    * Add function to save and restore view settings for an operation in database


    ---------

    Co-authored-by: Matthias Riße <9308656+matrss@users.noreply.github.com>
commit 5cff1a9ce19036519f129c77b198dae56dd00abe
Author: Annapurna Gupta <ganu48600@gmail.com>
Date:   Mon Sep 29 16:03:24 2025 +0530

    Feat: Implement view sharing in operations with Manage Views widget (#2893)

    Adds functionality to share custom views between operation members. Includes a 'Manage Views' widget allowing users to browse and apply shared views, as well as options for renaming views before sharing.  Addresses the need for collaborative view configurations within an operation.

When something would be missing you would see this also in "Files Changed" But there only the two changed. I assume this comes from a merge instead a rebase.

I rebased the branch onto develop.

The commit messages in question have been added on Commits on Oct 2, 2025

Your https://github.com/annapurna-gupta/MSS/tree/prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta is shown to me as

This branch is [24 commits ahead of](https://github.com/annapurna-gupta/MSS/compare/Open-MSS%3AMSS%3Aprepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta...prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta) 

and [29 commits behind](https://github.com/annapurna-gupta/MSS/compare/prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta...Open-MSS%3AMSS%3Aprepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta) Open-MSS/MSS:prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta.

and in yours you also find the changes from Commits on Oct 2, 2025

Bildschirmfoto 2026-01-02 um 15 47 51 Please sync it too.

i think i made a mistake, will fix it.

@annapurna-gupta
Copy link
Collaborator Author

@ReimarBauer I’ve updated my branch, but GitHub still shows some older commits in the comparison.
Could you please update Open-MSS/MSS:prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta as well.

@ReimarBauer
Copy link
Member

The PR has now unrelated changes to the issue. It should have only changes to the documentation.

@ReimarBauer ReimarBauer force-pushed the prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta branch from a142a3a to f5d5f6a Compare January 6, 2026 15:42
@ReimarBauer
Copy link
Member

@ReimarBauer I’ve updated my branch, but GitHub still shows some older commits in the comparison. Could you please update Open-MSS/MSS:prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta as well.

I rebased it on develop

@ReimarBauer
Copy link
Member

@annapurna-gupta maybe do the following. cherry pick the doc changes from this branch, rename the branch then
get your prepare_merge_to_develop_from_GSOC2025-AnnapurnaGupta in sync with the one from OpenMSS/MSS. Then make an new branch for these changes name it as the old one based on your prepare_merge_to_develop_from.... Then add the changes and send it per fastforward to github.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants