chore: use camelcase name in gui
This commit is contained in:
@@ -10,6 +10,10 @@ class Service(BaseModel):
|
||||
ioc_port: int
|
||||
status: ServiceStatus
|
||||
|
||||
@property
|
||||
def name_camel(self):
|
||||
return self.name
|
||||
|
||||
@property
|
||||
def name_upper(self):
|
||||
return self.name.upper()
|
||||
@@ -27,7 +31,7 @@ class Service(BaseModel):
|
||||
return self.name.lower()
|
||||
|
||||
def to_dict(self):
|
||||
return {"name": self.name_lower, "ioc_port": self.ioc_port, "status": str(self.status)}
|
||||
return {"name": self.name_camel, "ioc_port": self.ioc_port, "status": str(self.status)}
|
||||
|
||||
class Config:
|
||||
use_enum_values = True
|
||||
@@ -35,6 +39,8 @@ class Service(BaseModel):
|
||||
@field_validator("name")
|
||||
@classmethod
|
||||
def validate_name_chars(cls, value: str) -> str:
|
||||
if not re.match(r"^[a-z0-9-]+$", value):
|
||||
raise ValueError("name can only contain lowercase letters, numbers, and dashes")
|
||||
if not re.match(r"^[a-zA-Z0-9-]+$", value):
|
||||
raise ValueError(
|
||||
"name can only contain uppercase and lowercase letters, numbers, and dashes"
|
||||
)
|
||||
return value
|
||||
|
||||
@@ -17,15 +17,17 @@ class ServiceManagerUI(BaseModel):
|
||||
tree = ET.parse(path)
|
||||
return ServiceManagerUI(tree=tree)
|
||||
|
||||
def update_xml(self, service: Service, ui_name: str, ui_filename: str) -> None:
|
||||
def update_xml(self, service: Service, service_name_camel: str, ui_filename: str) -> None:
|
||||
num_macro_elements = self._update_macro(
|
||||
service=service, ui_name=ui_name, ui_filename=ui_filename
|
||||
service=service, service_name_camel=service_name_camel, ui_filename=ui_filename
|
||||
)
|
||||
self._update_heights(num_macro_elements=num_macro_elements)
|
||||
|
||||
def _update_macro(self, service: Service, ui_name: str, ui_filename: str) -> int:
|
||||
def _update_macro(self, service: Service, service_name_camel: str, ui_filename: str) -> int:
|
||||
new_macro_element = _ServiceManagerUIMacroElement(
|
||||
service_name_upper=service.name_upper, ui_name=ui_name, ui_filename=ui_filename
|
||||
service_name_upper=service.name_upper,
|
||||
service_name_camel=service_name_camel,
|
||||
ui_filename=ui_filename,
|
||||
)
|
||||
|
||||
num_macro_elements = None
|
||||
@@ -125,7 +127,7 @@ class ServiceManagerUI(BaseModel):
|
||||
|
||||
class _ServiceManagerUIMacroElement(BaseModel):
|
||||
service_name_upper: str
|
||||
ui_name: str
|
||||
service_name_camel: str
|
||||
panel: int = 1
|
||||
svc_exist: int = 1
|
||||
ui_filename: str
|
||||
@@ -134,7 +136,7 @@ class _ServiceManagerUIMacroElement(BaseModel):
|
||||
return (
|
||||
f"IOC=AGEBD-CPCL-{self.service_name_upper},"
|
||||
f"service={self.service_name_upper},"
|
||||
f"name={self.ui_name},"
|
||||
f"name={self.service_name_camel},"
|
||||
f"panel={self.panel},"
|
||||
f"svc_exist={self.svc_exist},"
|
||||
f"panelcmd=A_BD_{self.ui_filename}.ui"
|
||||
|
||||
Reference in New Issue
Block a user