mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
Merge pull request #620 from bunkerity/ui
Fix UI error when values are empty
This commit is contained in:
commit
4be53d0cbe
2 changed files with 31 additions and 47 deletions
52
.github/workflows/ui.yml
vendored
52
.github/workflows/ui.yml
vendored
|
@ -7,51 +7,35 @@ on:
|
||||||
branches: [ui]
|
branches: [ui]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
# Containers
|
# Containers
|
||||||
build-bw:
|
build-containers:
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
image: [bunkerweb, scheduler, ui]
|
||||||
|
include:
|
||||||
|
- image: bunkerweb
|
||||||
|
dockerfile: src/bw/Dockerfile
|
||||||
|
- image: scheduler
|
||||||
|
dockerfile: src/scheduler/Dockerfile
|
||||||
|
- image: ui
|
||||||
|
dockerfile: src/ui/Dockerfile
|
||||||
uses: ./.github/workflows/container-build.yml
|
uses: ./.github/workflows/container-build.yml
|
||||||
with:
|
with:
|
||||||
RELEASE: ui
|
RELEASE: ui
|
||||||
|
CACHE: true
|
||||||
ARCH: linux/amd64
|
ARCH: linux/amd64
|
||||||
IMAGE: bunkerweb
|
IMAGE: ${{ matrix.image }}
|
||||||
DOCKERFILE: src/bw/Dockerfile
|
DOCKERFILE: ${{ matrix.dockerfile }}
|
||||||
secrets:
|
secrets:
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
|
||||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
|
||||||
build-sc:
|
|
||||||
uses: ./.github/workflows/container-build.yml
|
|
||||||
with:
|
|
||||||
RELEASE: ui
|
|
||||||
ARCH: linux/amd64
|
|
||||||
IMAGE: scheduler
|
|
||||||
DOCKERFILE: src/scheduler/Dockerfile
|
|
||||||
secrets:
|
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
|
||||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
|
||||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
|
||||||
build-ui:
|
|
||||||
uses: ./.github/workflows/container-build.yml
|
|
||||||
with:
|
|
||||||
RELEASE: ui
|
|
||||||
ARCH: linux/amd64
|
|
||||||
IMAGE: ui
|
|
||||||
DOCKERFILE: src/ui/Dockerfile
|
|
||||||
secrets:
|
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
|
||||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
|
||||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
|
||||||
|
|
||||||
# UI tests
|
# UI tests
|
||||||
tests-ui:
|
tests-ui:
|
||||||
needs: [build-bw, build-sc, build-ui]
|
needs: [build-containers]
|
||||||
uses: ./.github/workflows/tests-ui.yml
|
uses: ./.github/workflows/tests-ui.yml
|
||||||
with:
|
with:
|
||||||
RELEASE: ui
|
RELEASE: ui
|
||||||
secrets:
|
|
||||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
|
||||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
|
||||||
|
|
|
@ -532,8 +532,8 @@ def services():
|
||||||
args=(
|
args=(
|
||||||
"services",
|
"services",
|
||||||
variables,
|
variables,
|
||||||
request.form.get("OLD_SERVER_NAME", "").split()[0],
|
request.form.get("OLD_SERVER_NAME", "").split(" ")[0],
|
||||||
variables.get("SERVER_NAME", "").split()[0],
|
variables.get("SERVER_NAME", "").split(" ")[0],
|
||||||
),
|
),
|
||||||
kwargs={"operation": request.form["operation"]},
|
kwargs={"operation": request.form["operation"]},
|
||||||
).start()
|
).start()
|
||||||
|
@ -541,11 +541,11 @@ def services():
|
||||||
message = ""
|
message = ""
|
||||||
|
|
||||||
if request.form["operation"] == "new":
|
if request.form["operation"] == "new":
|
||||||
message = f"Creating service {variables['SERVER_NAME'].split()[0]}"
|
message = f"Creating service {variables.get('SERVER_NAME', '').split(' ')[0]}"
|
||||||
elif request.form["operation"] == "edit":
|
elif request.form["operation"] == "edit":
|
||||||
message = f"Saving configuration for service {request.form['OLD_SERVER_NAME'].split()[0]}"
|
message = f"Saving configuration for service {request.form.get('OLD_SERVER_NAME', '').split(' ')[0]}"
|
||||||
elif request.form["operation"] == "delete":
|
elif request.form["operation"] == "delete":
|
||||||
message = f"Deleting service {request.form['SERVER_NAME'].split()[0]}"
|
message = f"Deleting service {request.form.get('SERVER_NAME', '').split(' ')[0]}"
|
||||||
|
|
||||||
return redirect(url_for("loading", next=url_for("services"), message=message))
|
return redirect(url_for("loading", next=url_for("services"), message=message))
|
||||||
|
|
||||||
|
@ -556,7 +556,7 @@ def services():
|
||||||
services=[
|
services=[
|
||||||
{
|
{
|
||||||
"SERVER_NAME": {
|
"SERVER_NAME": {
|
||||||
"value": service["SERVER_NAME"]["value"].split()[0],
|
"value": service["SERVER_NAME"]["value"].split(" ")[0],
|
||||||
"method": service["SERVER_NAME"]["method"],
|
"method": service["SERVER_NAME"]["method"],
|
||||||
},
|
},
|
||||||
"USE_REVERSE_PROXY": service["USE_REVERSE_PROXY"],
|
"USE_REVERSE_PROXY": service["USE_REVERSE_PROXY"],
|
||||||
|
@ -728,8 +728,8 @@ def configs():
|
||||||
join(sep, "etc", "bunkerweb", "configs"),
|
join(sep, "etc", "bunkerweb", "configs"),
|
||||||
db_data=db.get_custom_configs(),
|
db_data=db.get_custom_configs(),
|
||||||
services=app.config["CONFIG"]
|
services=app.config["CONFIG"]
|
||||||
.get_config(methods=False)["SERVER_NAME"]
|
.get_config(methods=False).get("SERVER_NAME", "")
|
||||||
.split(),
|
.split(" "),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
dark_mode=app.config["DARK_MODE"],
|
dark_mode=app.config["DARK_MODE"],
|
||||||
|
@ -1174,8 +1174,8 @@ def cache():
|
||||||
is_cache=True,
|
is_cache=True,
|
||||||
db_data=db.get_jobs_cache_files(),
|
db_data=db.get_jobs_cache_files(),
|
||||||
services=app.config["CONFIG"]
|
services=app.config["CONFIG"]
|
||||||
.get_config(methods=False)["SERVER_NAME"]
|
.get_config(methods=False).get("SERVER_NAME", "")
|
||||||
.split(),
|
.split(" "),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
dark_mode=app.config["DARK_MODE"],
|
dark_mode=app.config["DARK_MODE"],
|
||||||
|
@ -1276,7 +1276,7 @@ def logs_linux():
|
||||||
to_date = None
|
to_date = None
|
||||||
|
|
||||||
def date_filter(log: str):
|
def date_filter(log: str):
|
||||||
log_date = log.split()[0]
|
log_date = log.split(" ")[0]
|
||||||
log_date = float(log_date) if regex_match(r"^\d+\.\d+$", log_date) else 0
|
log_date = float(log_date) if regex_match(r"^\d+\.\d+$", log_date) else 0
|
||||||
if to_date is not None and log_date > int(to_date):
|
if to_date is not None and log_date > int(to_date):
|
||||||
return False
|
return False
|
||||||
|
@ -1305,7 +1305,7 @@ def logs_linux():
|
||||||
|
|
||||||
logs.append(
|
logs.append(
|
||||||
{
|
{
|
||||||
"content": " ".join(log.strip().split()[1:]),
|
"content": " ".join(log.strip().split(" ")[1:]),
|
||||||
"type": error_type,
|
"type": error_type,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -1409,7 +1409,7 @@ def logs_container(container_id):
|
||||||
)
|
)
|
||||||
|
|
||||||
for log in tmp_logs:
|
for log in tmp_logs:
|
||||||
splitted = log.split()
|
splitted = log.split(" ")
|
||||||
timestamp = splitted[0]
|
timestamp = splitted[0]
|
||||||
|
|
||||||
if to_date is not None and dateutil_parse(timestamp).timestamp() > to_date:
|
if to_date is not None and dateutil_parse(timestamp).timestamp() > to_date:
|
||||||
|
|
Loading…
Reference in a new issue