Fix mscolab flighttrack template handling #2652

annapurna-gupta · 2025-02-24T13:33:06Z

ReimarBauer · 2025-02-24T15:37:26Z

@annapurna-gupta all major tests are failing.

ReimarBauer · 2025-02-24T15:38:04Z

mslib/mscolab/file_manager.py

@@ -39,6 +39,7 @@
 from mslib.utils.verify_waypoint_data import verify_waypoint_data
 from mslib.mscolab.models import db, Operation, Permission, User, Change, Message
 from mslib.mscolab.conf import mscolab_settings
+from mslib.utils.config import MSUIDefaultConfig


The server on a remote place does not know MSUIDefaultConfig

ReimarBauer · 2025-02-24T15:38:43Z

mslib/mscolab/file_manager.py

@@ -103,7 +104,11 @@ def create_operation(self, path, description, user, last_used=None, content=None
            if content is not None:
                operation_file.write(content)
            else:
-                operation_file.write(mscolab_settings.STUB_CODE)
+                content = MSUIDefaultConfig.new_flighttrack_template or mscolab_settings.STUB_CODE


you need to implement this on the client side.

ReimarBauer · 2025-02-24T15:39:25Z

mslib/mscolab/seed.py

@@ -32,6 +32,7 @@
 from mslib.mscolab.conf import mscolab_settings
 from mslib.mscolab.models import User, db, Permission, Operation
 from mslib.mscolab.server import APP as app
+from mslib.utils.config import MSUIDefaultConfig


also seed belongs to the server. It does not know about MSUIDefaultConfig, or not on that what the user has

ReimarBauer · 2025-02-24T15:49:27Z

You need to use something like this:

MSS/mslib/msui/mscolab.py

Line 1937 in ecd2efb

def handle_import_msc(self, file_path, extension, function, pickertype):

But it is not all, you need a way to create the operation on the client site without the need of an initial server revision. This all needs to become covered by tests.

annapurna-gupta · 2025-02-25T12:57:58Z

You need to use something like this:

MSS/mslib/msui/mscolab.py

Line 1937 in ecd2efb

def handle_import_msc(self, file_path, extension, function, pickertype):

But it is not all, you need a way to create the operation on the client site without the need of an initial server revision. This all needs to become covered by tests.

so you mean that it needs to create an operation on the client side without connection MSCOLAB server, and in the operation, i need to use MSUIDefaultConfig.new_flighttrack_template as template and then write a test function for it. so that MSUI can can create operation without connecting the server, am i right? or something is missing?

ReimarBauer · 2025-02-25T13:15:05Z

You need to use something like this:

MSS/mslib/msui/mscolab.py

Line 1937 in ecd2efb

def handle_import_msc(self, file_path, extension, function, pickertype):

But it is not all, you need a way to create the operation on the client site without the need of an initial server revision. This all needs to become covered by tests.

so you mean that it needs to create an operation on the client side without connection MSCOLAB server, and in the operation, i need to use MSUIDefaultConfig.new_flighttrack_template as template and then write a test function for it. so that MSUI can can create operation without connecting the server, am i right? or something is missing?

Of course you need to be connected to the MSColab Service. When you create a new operation you have to feed in the data from the users local configuration for the initial operation.
This feature is currently only implemented for the Flighpath (left window of the msui view).

annapurna-gupta · 2025-02-25T16:07:27Z

You need to use something like this:

MSS/mslib/msui/mscolab.py

Line 1937 in ecd2efb

def handle_import_msc(self, file_path, extension, function, pickertype):

But it is not all, you need a way to create the operation on the client site without the need of an initial server revision. This all needs to become covered by tests.

so you mean that it needs to create an operation on the client side without connection MSCOLAB server, and in the operation, i need to use MSUIDefaultConfig.new_flighttrack_template as template and then write a test function for it. so that MSUI can can create operation without connecting the server, am i right? or something is missing?

Of course you need to be connected to the MSColab Service. When you create a new operation you have to feed in the data from the users local configuration for the initial operation. This feature is currently only implemented for the Flighpath (left window of the msui view).

so this will include change in ui of MSUI, it should have a button or a way for operation.

annapurna-gupta · 2025-02-25T16:19:32Z

@ReimarBauer could you please give me little more description of this issue.

ReimarBauer · 2025-02-26T07:12:51Z

@ReimarBauer could you please give me little more description of this issue.

Please ask specific questions, once I have planned a solution, this task is done and I would set the PR myself.
This task requires a reengenering of the server and client code to be able to create an operation on the server and then transmit data individually via client for initialization.

ReimarBauer · 2025-02-26T07:15:08Z

You need to use something like this:

MSS/mslib/msui/mscolab.py

Line 1937 in ecd2efb

def handle_import_msc(self, file_path, extension, function, pickertype):

But it is not all, you need a way to create the operation on the client site without the need of an initial server revision. This all needs to become covered by tests.

so you mean that it needs to create an operation on the client side without connection MSCOLAB server, and in the operation, i need to use MSUIDefaultConfig.new_flighttrack_template as template and then write a test function for it. so that MSUI can can create operation without connecting the server, am i right? or something is missing?

Of course you need to be connected to the MSColab Service. When you create a new operation you have to feed in the data from the users local configuration for the initial operation. This feature is currently only implemented for the Flighpath (left window of the msui view).

so this will include change in ui of MSUI, it should have a button or a way for operation.

On the client everything in the UI is defined, no extra button needed. The handling needs changes.

ReimarBauer · 2025-03-02T17:56:56Z

of the msui view).\n\nso this will include change in ui of MSUI, it should have a button or a way for operation.

No.
FILE

NEW OPERATION

is there already. You need to send data to the server. Change the API of the server. Use the received information.

there is a tutorial which describes how mscolab can be used
https://mss.readthedocs.io/en/stable/tutorials/tutorial_mscolab.html

The task is about removing STUB_CODE

and use the submitted data by the user.
The data is defined in the users configuration.

annapurna-gupta · 2025-03-03T15:05:34Z

of the msui view).\n\nso this will include change in ui of MSUI, it should have a button or a way for operation.

No. FILE

NEW OPERATION

is there already. You need to send data to the server. Change the API of the server. Use the received information.

there is a tutorial which describes how mscolab can be used https://mss.readthedocs.io/en/stable/tutorials/tutorial_mscolab.html

The task is about removing STUB_CODE and use the submitted data by the user. The data is defined in the users configuration.

okk

ReimarBauer · 2025-03-03T17:47:35Z

mslib/mscolab/file_manager.py

@@ -146,6 +151,35 @@ def list_operations(self, user, skip_archived=False):
                })
        return operations

+    @app.route('/create_operation', methods=['POST'])
+    def create_operation_route():


all routes should be in the server code.

ReimarBauer · 2025-03-03T17:48:07Z

mslib/mscolab/file_manager.py

@@ -146,6 +151,35 @@ def list_operations(self, user, skip_archived=False):
                })
        return operations

+    @app.route('/create_operation', methods=['POST'])


this needs in the server code, a @verify_user

ReimarBauer · 2025-03-03T17:49:11Z

mslib/mscolab/seed.py

@@ -151,7 +151,8 @@ def add_operation(operation_name, description):
            with fs.open_fs(mscolab_settings.OPERATIONS_DATA) as file_dir:
                if not file_dir.exists(operation_name):
                    file_dir.makedir(operation_name)
-                    file_dir.writetext(f'{operation_name}/main.ftml', mscolab_settings.STUB_CODE)
+                    content = mscolab_settings.STUB_CODE


a duplication of the var?

sorry this is a mistake.

ReimarBauer · 2025-03-03T17:49:42Z

mslib/msui/mscolab.py

@@ -982,7 +982,7 @@ def browse():
        self.add_proj_dialog = add_operation_ui.Ui_addOperationDialog()
        self.add_proj_dialog.setupUi(self.proj_diag)
        self.add_proj_dialog.f_content = None
-        self.add_proj_dialog.buttonBox.accepted.connect(self.add_operation)
+        self.add_proj_dialog.buttonBox.accepted.connect(self.create_local_operation)


please use the existing method and modify it so that it does the new aspect.

To pass MSUIDefaultConfig.new_flighttrack_template to the server, I’ve created this function that initially triggers when the user clicks on the MSColab operation button. This function will check for initial data, include the template, and then pass it to the add_operation function, which will handle the operation as expected...this is what i am trying to do

that looks way to complicated
the server has

@APP.route('/create_operation', methods=["POST"]) @verify_user def create_operation()

And to that you can send content

content = request.form.get('content', None)

That means when the user is not using a ftml file to upload a local file the default content sended is the content based on the user local settings, of course when you send it. :)

When you add content always with the users new_flight_template to the data in
https://github.com/Open-MSS/MSS/blob/develop/mslib/msui/mscolab.py#L1031

You have only to convert the data from new_flight_template to a ftml str syntax.

there for flightracks the template is used to create a waypoint table. When you have a waypoint table you can format it to different types.

https://github.com/Open-MSS/MSS/blob/develop/mslib/msui/msui_mainwindow.py#L750

ReimarBauer

see comments

ReimarBauer · 2025-03-06T16:08:20Z

mslib/mscolab/file_manager.py

@@ -103,7 +104,11 @@ def create_operation(self, path, description, user, last_used=None, content=None
            if content is not None:
                operation_file.write(content)
            else:
-                operation_file.write(mscolab_settings.STUB_CODE)
+                content = mscolab_settings.STUB_CODE


we want to remove the constant STUB_CODE and use only the new_flighttrack_template which the user provides in her msui_settings.json

ReimarBauer · 2025-03-06T19:34:49Z

you need to rebase to develop

annapurna-gupta added 2 commits February 24, 2025 14:22

added templet

53a306f

handle error

514a868

ReimarBauer reviewed Feb 24, 2025

View reviewed changes

update changes

6939565

ReimarBauer reviewed Mar 3, 2025

View reviewed changes

ReimarBauer requested changes Mar 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix mscolab flighttrack template handling #2652

Fix mscolab flighttrack template handling #2652

annapurna-gupta commented Feb 24, 2025

ReimarBauer commented Feb 24, 2025

ReimarBauer Feb 24, 2025

ReimarBauer Feb 24, 2025

annapurna-gupta Feb 25, 2025

ReimarBauer Feb 24, 2025

ReimarBauer commented Feb 24, 2025

annapurna-gupta commented Feb 25, 2025

ReimarBauer commented Feb 25, 2025

annapurna-gupta commented Feb 25, 2025

annapurna-gupta commented Feb 25, 2025

ReimarBauer commented Feb 26, 2025

ReimarBauer commented Feb 26, 2025

ReimarBauer commented Mar 2, 2025 •

edited

Loading

annapurna-gupta commented Mar 3, 2025

ReimarBauer Mar 3, 2025

annapurna-gupta Mar 4, 2025

ReimarBauer Mar 3, 2025

annapurna-gupta Mar 4, 2025

ReimarBauer Mar 3, 2025

annapurna-gupta Mar 4, 2025

ReimarBauer Mar 3, 2025 •

edited

Loading

annapurna-gupta Mar 4, 2025 •

edited

Loading

ReimarBauer Mar 5, 2025 •

edited

Loading

ReimarBauer Mar 5, 2025

ReimarBauer Mar 5, 2025

ReimarBauer left a comment

ReimarBauer Mar 6, 2025

ReimarBauer commented Mar 6, 2025

Fix mscolab flighttrack template handling #2652

Are you sure you want to change the base?

Fix mscolab flighttrack template handling #2652

Conversation

annapurna-gupta commented Feb 24, 2025

ReimarBauer commented Feb 24, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer commented Feb 24, 2025

annapurna-gupta commented Feb 25, 2025

ReimarBauer commented Feb 25, 2025

annapurna-gupta commented Feb 25, 2025

annapurna-gupta commented Feb 25, 2025

ReimarBauer commented Feb 26, 2025

ReimarBauer commented Feb 26, 2025

ReimarBauer commented Mar 2, 2025 • edited Loading

annapurna-gupta commented Mar 3, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer Mar 3, 2025 • edited Loading

Choose a reason for hiding this comment

annapurna-gupta Mar 4, 2025 • edited Loading

Choose a reason for hiding this comment

ReimarBauer Mar 5, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer commented Mar 6, 2025

ReimarBauer commented Mar 2, 2025 •

edited

Loading

ReimarBauer Mar 3, 2025 •

edited

Loading

annapurna-gupta Mar 4, 2025 •

edited

Loading

ReimarBauer Mar 5, 2025 •

edited

Loading