Now uses object types without the space

pnnl · Jul 26, 2023 · 665191b · 665191b
1 parent 3246543
commit 665191b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/src/app/api_to_method.json b/src/app/api_to_method.json
@@ -1,5 +1,5 @@
 {
-    "Verification Case": [
+    "VerificationCase": [
         "case_already_in_suite",
         "check_file",
         "check_json_path_type",
@@ -13,7 +13,7 @@
         "validate",
         "validate_verification_case_structure"
     ],
-    "Data Processing": [
+    "DataProcessing": [
         "add_parameter",
         "apply_function",
         "check",
@@ -27,7 +27,7 @@
     "Reporting": [
         "report_multiple_cases"
     ],
-    "Verification Library": [
+    "VerificationLibrary": [
         "get_applicable_library_items_by_datapoints",
         "get_library_item",
         "get_library_items",

diff --git a/src/app/app.py b/src/app/app.py
@@ -90,6 +90,10 @@ def initialize_ui(self, setting):
         self.submit_button.setFixedSize(100, 20)
         self.submit_button.clicked.connect(self.submit_form)
 
+        # self.reformat_button = QPushButton('Reformat')
+        # self.reformat_button.setFixedSize(100, 20)
+        # self.reformat_button.clicked.connect(self.validate_form)
+
         buttons = QHBoxLayout()
         buttons.addWidget(self.validate_button)
         buttons.addWidget(self.submit_button)
@@ -252,7 +256,6 @@ def validate_form(self):
         warnings.simplefilter(action="ignore", category=ResourceWarning)
         validate_wf = Workflow(json_data)
         valid = validate_wf.validate(verbose=True)
-        print(valid)
         if valid:
             self.submit_button.setEnabled(True)
 

diff --git a/src/app/dependencies.json b/src/app/dependencies.json
@@ -1,5 +1,5 @@
 {
-    "Verification Case": {
+    "VerificationCase": {
         "Initialize": [
             {"label": "Cases", "type": "line_edit"},
             {"label": "JSON Case Path", "type": "line_edit"}
@@ -17,7 +17,7 @@
             {"label": "Var Type", "type": "line_edit"}
         ]
     },
-    "Data Processing": {
+    "DataProcessing": {
         "Initialize": [
             {"label": "Data Path", "type": "line_edit"},
             {"label": "Data Source", "type": "line_edit"},
@@ -72,7 +72,7 @@
             {"label": "Item Names", "type": "line_edit"}
         ]
     },
-    "Verification Library": {
+    "VerificationLibrary": {
         "Initialize": [
             {"label": "Lib Path", "type": "line_edit"}
         ],

diff --git a/src/app/popup_window.py b/src/app/popup_window.py
@@ -209,8 +209,8 @@ def load_method_ui(self, state, layout):
                             for p in state["Parameters"]
                         }
                     )
-            elif method_call in [api.replace(" ", "") for api in schema.keys()]:
-                object_type = re.sub(r"([a-z])([A-Z])", r"\1 \2", method_call)
+            elif method_call in schema.keys():
+                object_type = method_call
                 method = "Initialize"
                 if "Parameters" in state.keys():
                     parameters.update(
@@ -385,7 +385,7 @@ def update_form(self, custom=False):
         method = self.method_combo_box.currentText()
         fields = schema.get(object_type, {}).get(method, [])
 
-        if not custom and (not fields or method == "Initialize"):
+        if not custom and not fields:
             object_type = "Verification Case"
             method = "Initialize"
             fields = schema.get(object_type, {}).get(method, [])
@@ -492,7 +492,7 @@ def save(self):
                 object = self.payload_combo_box.currentText()
                 self.form_data["MethodCall"] = f"Payloads['{object}'].{method}"
 
-        self.form_data["Parameters"] = []
+        self.form_data["Parameters"] = {}
 
         for i in range(self.form_layout.count()):
             item = self.form_layout.itemAt(i).widget()
@@ -513,7 +513,7 @@ def save(self):
                 self.form_data[parameter] = text
             elif not self.current_params:
                 parameter = (parameter.lower()).replace(" ", "_")
-                self.form_data["Parameters"].append({parameter: text})
+                self.form_data["Parameters"][parameter] = text
 
         self.close()
 

diff --git a/src/app/workflow_diagram.py b/src/app/workflow_diagram.py
@@ -212,7 +212,10 @@ def call_advanced_popup(self, rect=None, edit=False):
     def item_clicked(self):
         if self.view.itemClicked:
             rect = self.view.itemClicked
-            self.call_popup(rect, True)
+            if self.setting == "basic":
+                self.call_popup(rect, True)
+            elif self.setting == "advanced":
+                self.call_advanced_popup(rect, True)
 
     def read_import(self, states):
         if isinstance(states, dict):