-
Notifications
You must be signed in to change notification settings - Fork 101
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.
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
Fix mscolab flighttrack template handling #2652
base: develop
Are you sure you want to change the base?
Fix mscolab flighttrack template handling #2652
Conversation
@annapurna-gupta all major tests are failing. |
mslib/mscolab/file_manager.py
Outdated
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The server on a remote place does not know MSUIDefaultConfig
mslib/mscolab/file_manager.py
Outdated
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need to implement this on the client side.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i got you.
mslib/mscolab/seed.py
Outdated
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also seed belongs to the server. It does not know about MSUIDefaultConfig, or not on that what the user has
You need to use something like this: Line 1937 in ecd2efb
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. |
so this will include change in ui of MSUI, it should have a button or a way for operation. |
@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. |
On the client everything in the UI is defined, no extra button needed. The handling needs changes. |
No.
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 The task is about removing STUB_CODE |
okk |
@@ -146,6 +151,35 @@ def list_operations(self, user, skip_archived=False): | |||
}) | |||
return operations | |||
|
|||
@app.route('/create_operation', methods=['POST']) | |||
def create_operation_route(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all routes should be in the server code.
@@ -146,6 +151,35 @@ def list_operations(self, user, skip_archived=False): | |||
}) | |||
return operations | |||
|
|||
@app.route('/create_operation', methods=['POST']) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this needs in the server code, a @verify_user
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a duplication of the var?
@@ -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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please use the existing method and modify it so that it does the new aspect.
Fixes #2474