v1.0.76: modify shows actual instance param values (preview operation)

site/app.py

@@ -6,7 +6,7 @@ from routes.main import bp as main_bp
 from routes.api import bp as api_bp
 from routes.api_test import bp as api_test_bp
 
-VERSION = "1.0.74"
+VERSION = "1.0.76"
 
 app = Flask(__name__, template_folder="templates", static_folder="static")
 app.config["NUBES_API_ENDPOINT"] = os.getenv("NUBES_API_ENDPOINT", "https://lk-api-gateway-dev.ngcloud.ru/api/v1/svc")

site/routes/api_test.py

@@ -100,10 +100,40 @@ def api_operations(svc_id):
 @bp.route("/api/params/<int:op_id>")
 def api_params(op_id):
     try:
+        instance_uid = request.args.get("instanceUid")
+        op_name = request.args.get("opName")
+
+        if instance_uid and op_name:
+            # Создать pending-операцию чтобы прочитать ТЕКУЩИЕ значения параметров инстанса
+            op_payload = {"instanceUid": instance_uid, "svcOperationId": op_id, "operation": op_name}
+            op_resp = _client().post("/instanceOperations", op_payload)
+            preview_op_uid = _find_uid(op_resp) or _uid_from_location(op_resp.get("_location", ""))
+            if not preview_op_uid:
+                return jsonify({"error": "Не удалось создать preview-операцию"}), 500
+
+            op_data = _client().get(f"/instanceOperations/{preview_op_uid}")
+            cfs_params = op_data.get("instanceOperation", {}).get("cfsParams", [])
+
+            result = []
+            for p in cfs_params:
+                dd = p.get("dataDescriptor")
+                result.append({
+                    "svcOperationCfsParamId": p["svcOperationCfsParamId"],
+                    "name": p.get("svcOperationCfsParam", ""),
+                    "dataType": p.get("dataType", ""),
+                    "isRequired": p.get("isRequired", False),
+                    "defaultValue": p.get("paramValue"),  # текущее значение из инстанса
+                    "valueList": p.get("valueList"),
+                    "dataDescriptor": {k: {"dataType": v.get("dataType",""), "valueList": v.get("valueList",""), "isRequired": v.get("isRequired", False)} for k, v in dd.items()} if isinstance(dd, dict) else None,
+                })
+            return jsonify({"params": result, "previewOpUid": preview_op_uid})
+
+        # Без instanceUid — шаблонные значения по умолчанию
         data = _client().get(f"/instanceOperations/default/{op_id}")
         params = data["svcOperation"]["cfsParams"]
         result = []
         for p in params:
+            dd = p.get("dataDescriptor")
             result.append({
                 "svcOperationCfsParamId": p["svcOperationCfsParamId"],
                 "name": p.get("svcOperationCfsParam", ""),
@@ -111,9 +141,9 @@ def api_params(op_id):
                 "isRequired": p.get("isRequired", False),
                 "defaultValue": p.get("defaultValue"),
                 "valueList": p.get("valueList"),
-                "dataDescriptor": {k: {"dataType": v.get("dataType",""), "valueList": v.get("valueList",""), "isRequired": v.get("isRequired", False)} for k, v in p.get("dataDescriptor", {}).items()} if p.get("dataDescriptor") else None,
+                "dataDescriptor": {k: {"dataType": v.get("dataType",""), "valueList": v.get("valueList",""), "isRequired": v.get("isRequired", False)} for k, v in dd.items()} if isinstance(dd, dict) else None,
             })
-        return jsonify(result)
+        return jsonify({"params": result})
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
@@ -130,6 +160,7 @@ def api_test():
     params = data.get("params", {})
     instance_uid = data.get("instanceUid")
     display_name = data.get("displayName") or ""
+    preview_op_uid = data.get("previewOpUid")
 
     client = _client()
 
@@ -172,7 +203,14 @@ def api_test():
             if not instance_uid:
                 return jsonify({"status": "FAIL", "error": "Нет instanceUid"}), 400
 
-            if op_name == "redeploy":
+            if preview_op_uid:
+                # Переиспользовать preview-операцию (уже создана в api_params)
+                op_uid = preview_op_uid
+                for pid, pval in params.items():
+                    client.post("/instanceOperationCfsParams",
+                        {"instanceOperationUid": op_uid, "svcOperationCfsParamId": int(pid), "paramValue": str(pval)})
+                client.post(f"/instanceOperations/{op_uid}/run")
+            elif op_name == "redeploy":
                 op_payload = {"instanceUid": instance_uid, "svcOperationId": svc_op_id, "operation": op_name}
                 op_resp = client.post("/instanceOperations", op_payload)
                 op_uid = _find_uid(op_resp) or _uid_from_location(op_resp.get("_location", ""))

site/templates/index.html

@@ -205,9 +205,13 @@ function showParams(opId,opName){
     document.getElementById('stages-box').style.display='none';
     document.getElementById('test-status').textContent='';
 
-    fetch('/api/params/'+opId).then(r=>r.json()).then(params=>{
+    const isCreate=opName==='create';
+    const qs=isCreate?'' : `?instanceUid=${selectedInst}&opName=${opName}`;
+    fetch('/api/params/'+opId+qs).then(r=>r.json()).then(data=>{
+        const params=data.params||data;  // data.params в новом формате, fallback на старый массив
+        if(data.previewOpUid) selectedOp.previewOpUid=data.previewOpUid;
         const form=document.getElementById('params-form');
-        const displayNameValue=opName==='create'?makeCreateDisplayName():'';
+        const displayNameValue=isCreate?makeCreateDisplayName():'';
         form.innerHTML=(opName==='create'?`<div class="param-row"><label class="req">displayName</label><span style="font-size:12px;color:var(--muted);white-space:nowrap;">${AUTOTEST_PREFIX}</span><input type="text" id="param-displayname" value="${displayNameValue}" autocomplete="off"></div>`:'')
             + params.map(p=>{
             const req=p.isRequired;
@@ -284,7 +288,8 @@ async function executeOp(params){
             svcOperationId:selectedOp.opId,
             params,
             instanceUid:selectedInst||'',
-            displayName:isCreate ? displayName : ''
+            displayName:isCreate ? displayName : '',
+            previewOpUid:selectedOp.previewOpUid||''
         })});
         const d=await r.json();
         if(d.status==='FAIL'){document.getElementById('test-status').innerHTML=` <span class="badge">FAIL</span> ${d.error||''}`;btn.disabled=false;return;}