remove validation from host, port, admin

Author: KatKatKateryna

models/top_level/ServerConfig.py

@@ -22,17 +22,17 @@ class ServerOptionalBoolsEnum(Enum):
 @dataclass(kw_only=True)
 class ServerBindConfig:
     host: str = field(default="0.0.0.0")
-    port: int = field(default=5000)
+    port: int | str = field(default=5000)
 
 
 @dataclass(kw_only=True)
 class ServerLimitsConfig:
     default_items: int = field(default=10)
     max_items: int = field(default=10)
     on_exceed: ServerOnExceedEnum | None = None
-    max_distance_x : int | None = None
-    max_distance_y : int | None = None
-    max_distance_units : int | None = None
+    max_distance_x: int | None = None
+    max_distance_y: int | None = None
+    max_distance_units: int | None = None
 
 
 @dataclass(kw_only=True)
@@ -80,7 +80,7 @@ class ServerConfig:
     languages: list | None = None
     gzip: ServerOptionalBoolsEnum | None = None
     pretty_print: ServerOptionalBoolsEnum | None = None
-    admin: ServerOptionalBoolsEnum | None = None
+    admin: str | None = None
     cors: ServerOptionalBoolsEnum | None = None
     limits: ServerLimitsConfig | None = None
     templates: ServerTemplatesConfig | None = None

pygeoapi_config_dialog_base.ui

@@ -58,9 +58,6 @@
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="1">
            <widget class="QLineEdit" name="lineEditHost">
-            <property name="inputMask">
-             <string>000.0.0.0</string>
-            </property>
            </widget>
           </item>
           <item row="0" column="0">
@@ -78,10 +75,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QSpinBox" name="spinBoxPort">
-            <property name="maximum">
-             <number>9999</number>
-            </property>
+           <widget class="QLineEdit" name="lineEditPort">
            </widget>
           </item>
          </layout>
@@ -290,48 +284,51 @@
 
        <item row="6" column="0" rowspan="1">
         <layout class="QVBoxLayout" name="horizontalLayout_7">
+
+        
           <item>    
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                 <item>
                 <widget class="QLabel" name="label_4">
                   <property name="text">
-                  <string>gzip</string>
+                  <string>admin</string>
                   </property>
                 </widget>
                 </item>
                 <item>
-                <widget class="QComboBox" name="comboBoxGzip">
-                </widget>
+                <widget class="QLineEdit" name="lineEditAdmin"/>
                 </item>
               </layout>
           </item>
-          
+
+
           <item>    
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                 <item>
                 <widget class="QLabel" name="label_4">
                   <property name="text">
-                  <string>pretty print</string>
+                  <string>gzip</string>
                   </property>
                 </widget>
                 </item>
                 <item>
-                <widget class="QComboBox" name="comboBoxPretty"/>
+                <widget class="QComboBox" name="comboBoxGzip">
+                </widget>
                 </item>
               </layout>
           </item>
-
+          
           <item>    
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                 <item>
                 <widget class="QLabel" name="label_4">
                   <property name="text">
-                  <string>admin</string>
+                  <string>pretty print</string>
                   </property>
                 </widget>
                 </item>
                 <item>
-                <widget class="QComboBox" name="comboBoxAdmin"/>
+                <widget class="QComboBox" name="comboBoxPretty"/>
                 </item>
               </layout>
           </item>

ui_widgets/DataSetterFromUi.py

@@ -59,7 +59,10 @@ def set_data_from_ui(self):
 
         # bind
         config_data.server.bind.host = dialog.lineEditHost.text()
-        config_data.server.bind.port = dialog.spinBoxPort.value()
+        try:
+            config_data.server.bind.port = int(dialog.lineEditPort.text())
+        except ValueError:
+            config_data.server.bind.port = dialog.lineEditPort.text()
 
         # gzip
         # config_data.server.gzip = dialog.checkBoxGzip.isChecked()
@@ -74,10 +77,7 @@ def set_data_from_ui(self):
         )
 
         # admin
-        # config_data.server.admin = dialog.checkBoxAdmin.isChecked()
-        config_data.server.admin = get_enum_value_from_string(
-            ServerOptionalBoolsEnum, dialog.comboBoxAdmin.currentText()
-        )
+        config_data.server.admin = dialog.lineEditAdmin.text()
 
         # cors
         # config_data.server.cors = dialog.checkBoxCors.isChecked()

ui_widgets/UiSetter.py

@@ -68,7 +68,7 @@ def set_ui_from_data(self):
 
         # bind
         self.dialog.lineEditHost.setText(config_data.server.bind.host)
-        self.dialog.spinBoxPort.setValue(config_data.server.bind.port)
+        self.dialog.lineEditPort.setText(str(config_data.server.bind.port))
 
         # gzip
         # self.dialog.checkBoxGzip.setChecked(config_data.server.gzip)
@@ -85,11 +85,7 @@ def set_ui_from_data(self):
         )
 
         # admin
-        # self.dialog.checkBoxAdmin.setChecked(config_data.server.admin)
-        set_combo_box_value_from_data(
-            combo_box=self.dialog.comboBoxAdmin,
-            value=str(config_data.server.admin),
-        )
+        self.dialog.lineEditAdmin.setText(config_data.server.admin)
 
         # cors
         # self.dialog.checkBoxCors.setChecked(config_data.server.cors)
@@ -512,7 +508,6 @@ def customize_ui_on_launch(self):
         )
         fill_combo_box(dialog.comboBoxGzip, ServerOptionalBoolsEnum.NONE)
         fill_combo_box(dialog.comboBoxPretty, ServerOptionalBoolsEnum.NONE)
-        fill_combo_box(dialog.comboBoxAdmin, ServerOptionalBoolsEnum.NONE)
         fill_combo_box(dialog.comboBoxCors, ServerOptionalBoolsEnum.NONE)
 
         # add default values to the Resource UI