Fix mscolab flighttrack template handling

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 flask import Flask, request, jsonify
 
 
 class FileManager:
@@ -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
+                # Convert list to string
+                if isinstance(content, list):
+                    content = '\n'.join(content)
+                operation_file.write(content)
             operation_path = fs.path.combine(self.data_dir, operation.path)
             r = git.Repo.init(operation_path)
             r.git.clear_cache()
@@ -146,6 +151,35 @@ def list_operations(self, user, skip_archived=False):
                 })
         return operations
 
+    @app.route('/create_operation', methods=['POST'])
+    def create_operation_route():
+        data = request.form
+        path = data.get('path')
+        description = data.get('description', 'Initial flight track')
+        content = data.get('content')
+        category = data.get('category', 'default')
+        active = data.get('active', 'True') == 'True'
+        token = data.get('token')
+
+        user = verify_user_token(token)
+
+        if not user:
+            return jsonify({"success": False, "message": "Invalid token"}), 401
+
+        success = mscolab.create_operation(
+            path=path,
+            description=description,
+            user=user,
+            content=content,
+            category=category,
+            active=active
+        )
+
+        if success:
+            return jsonify({"success": True, "message": f"Operation '{path}' created successfully"})
+        else:
+            return jsonify({"success": False, "message": "Failed to create operation"})
+
     def is_member(self, u_id, op_id):
         """
         op_id: operation id

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
+                    file_dir.writetext(f'{operation_name}/main.ftml', content)
                     # initiate git
                     r = git.Repo.init(fs.path.join(mscolab_settings.DATA_DIR, 'filedata', operation_name))
                     r.git.clear_cache()

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)
         self.add_proj_dialog.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False)
         self.add_proj_dialog.path.textChanged.connect(check_and_enable_operation_accept)
         self.add_proj_dialog.description.textChanged.connect(check_and_enable_operation_accept)
@@ -1027,21 +1027,23 @@ def add_operation(self):
         if self.add_proj_dialog.f_content is not None:
             data["content"] = self.add_proj_dialog.f_content
         try:
-            response = self.conn.request_post("create_operation", data)
+            response = self.create_local_operation(path, description, category)
+
+            if response == "True":
+                QMessageBox.information(
+                    self.ui, "Creation successful",
+                    "Your operation was created successfully.",
+                )
+                op_id = self.get_recent_op_id()
+                self.new_op_id = op_id
+                self.conn.handle_new_operation(op_id)
+                self.signal_operation_added.emit(op_id, path)
+            else:
+                self.show_error_message(f"Operation creation failed: {response}")
         except requests.exceptions.RequestException as ex:
             raise MSColabConnectionError(f"Some error occurred ({ex})! Please reconnect.")
-        if response.text == "True":
-            QMessageBox.information(
-                self.ui, "Creation successful",
-                "Your operation was created successfully.",
-            )
-            op_id = self.get_recent_op_id()
-            self.new_op_id = op_id
-            self.conn.handle_new_operation(op_id)
-            self.signal_operation_added.emit(op_id, path)
-        else:
-            self.error_dialog = QtWidgets.QErrorMessage()
-            self.error_dialog.showMessage('The path already exists')
+        except Exception as ex:
+            self.show_error_message(f"Operation creation failed: {str(ex)}")
 
     @verify_user_token
     def get_recent_op_id(self):

mslib/msui/msui_mainwindow.py

@@ -915,6 +915,41 @@ def close_selected_flight_track(self):
             if ret == QtWidgets.QMessageBox.Yes:
                 self.listFlightTracks.takeItem(self.listFlightTracks.currentRow())
 
+def create_local_operation(self, operation_name):
+       if not operation_name:
+        return "Operation name is required"
+
+    existing_ops = self.list_operations(self.user)
+    if any(op["path"] == operation_name for op in existing_ops):
+        return "An operation with this name already exists"
+
+    initial_template = MSUIDefaultConfig.new_flighttrack_template
+    try:
+        model = ft.WaypointsTableModel(waypoints=initial_template)
+        xml_doc = model.get_xml_doc()
+        initial_content = xml_doc.toprettyxml(indent="  ", newl="\n")
+    except SyntaxError:
+        return "Invalid flight track template"
+
+    try:
+        response = requests.post(
+            f"{self.mscolab_server_url}/create_operation",
+            data={
+                "path": operation_name,
+                "content": initial_content,
+                "description": description,
+                "category": category,
+                "active": "True",
+                "token": self.token
+            },
+            timeout=10
+        )
+        response.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        return f"Failed to connect to server: {e}"
+
+    return response.text
+
     def create_view_handler(self, _type):
         if self.local_active:
             self.create_view(_type, self.active_flight_track)

tests/_test_mscolab/test_file_manager.py

@@ -296,7 +296,7 @@ def test_upload_file(self):
     def test_get_file(self):
         with self.app.test_client():
             flight_path, operation = self._create_operation(flight_path="operation7")
-            assert self.fm.get_file(operation.id, self.user).startswith('<?xml version="1.0" encoding="utf-8"?>')
+            assert self.fm.get_file(operation.id, self.user).startswith('Nagpur')
 
     def test_get_all_changes(self):
         with self.app.test_client():

tests/_test_mscolab/test_server.py

@@ -254,7 +254,7 @@ def test_get_operation_by_id(self):
             response = test_client.get('/get_operation_by_id', data={"token": token,
                                                                      "op_id": operation.id})
             assert response.status_code == 200
-            assert "<ListOfWaypoints>" in response.data.decode('utf-8')
+            assert "Nagpur\\nDelhi"  in response.data.decode('utf-8')
 
     def test_get_operations(self):
         assert add_user(self.userdata[0], self.userdata[1], self.userdata[2])