mirror of
https://framagit.org/framasoft/framaspace/argos.git
synced 2025-04-29 10:22:37 +02:00
🔀 Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
0da1f4986e
6 changed files with 17 additions and 11 deletions
|
@ -2,6 +2,9 @@
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
- 🐛 - Fix database migrations without default values
|
||||||
|
- 🐛 - Fix domain status selector’s bug on page refresh
|
||||||
|
|
||||||
## 0.6.0
|
## 0.6.0
|
||||||
|
|
||||||
Date: 2024-11-28
|
Date: 2024-11-28
|
||||||
|
|
|
@ -21,7 +21,14 @@ depends_on: Union[str, Sequence[str], None] = None
|
||||||
def upgrade() -> None:
|
def upgrade() -> None:
|
||||||
with op.batch_alter_table("tasks", schema=None) as batch_op:
|
with op.batch_alter_table("tasks", schema=None) as batch_op:
|
||||||
batch_op.add_column(sa.Column("recheck_delay", sa.Float(), nullable=True))
|
batch_op.add_column(sa.Column("recheck_delay", sa.Float(), nullable=True))
|
||||||
batch_op.add_column(sa.Column("already_retried", sa.Boolean(), nullable=False))
|
batch_op.add_column(
|
||||||
|
sa.Column(
|
||||||
|
"already_retried",
|
||||||
|
sa.Boolean(),
|
||||||
|
nullable=False,
|
||||||
|
server_default=sa.sql.false(),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
def downgrade() -> None:
|
||||||
|
|
|
@ -36,6 +36,7 @@ def upgrade() -> None:
|
||||||
name="method",
|
name="method",
|
||||||
),
|
),
|
||||||
nullable=False,
|
nullable=False,
|
||||||
|
server_default="GET",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
function filterDomains(e) {
|
function filterDomains() {
|
||||||
let status = document.getElementById('select-status');
|
let status = document.getElementById('select-status');
|
||||||
let filter = document.getElementById('domain-search').value;
|
let filter = document.getElementById('domain-search').value;
|
||||||
console.log(filter)
|
console.log(filter)
|
||||||
|
@ -111,13 +111,7 @@
|
||||||
}
|
}
|
||||||
document.getElementById('select-status').addEventListener('change', filterDomains);
|
document.getElementById('select-status').addEventListener('change', filterDomains);
|
||||||
document.getElementById('domain-search').addEventListener('input', filterDomains);
|
document.getElementById('domain-search').addEventListener('input', filterDomains);
|
||||||
document.querySelectorAll('[data-status]').forEach((item) => {
|
filterDomains()
|
||||||
if (item.dataset.status !== 'ok') {
|
|
||||||
item.style.display = null;
|
|
||||||
} else {
|
|
||||||
item.style.display = 'none';
|
|
||||||
}
|
|
||||||
})
|
|
||||||
document.getElementById('js-only').style.display = null;
|
document.getElementById('js-only').style.display = null;
|
||||||
</script>
|
</script>
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|
|
@ -28,7 +28,7 @@ dependencies = [
|
||||||
"durations-nlp>=1.0.1,<2",
|
"durations-nlp>=1.0.1,<2",
|
||||||
"fastapi>=0.103,<0.104",
|
"fastapi>=0.103,<0.104",
|
||||||
"fastapi-login>=1.10.0,<2",
|
"fastapi-login>=1.10.0,<2",
|
||||||
"httpx>=0.27.2,<1",
|
"httpx>=0.27.2,<0.28.0",
|
||||||
"Jinja2>=3.0,<4",
|
"Jinja2>=3.0,<4",
|
||||||
"jsonpointer>=3.0,<4",
|
"jsonpointer>=3.0,<4",
|
||||||
"passlib>=1.7.4,<2",
|
"passlib>=1.7.4,<2",
|
||||||
|
@ -48,7 +48,7 @@ dependencies = [
|
||||||
dev = [
|
dev = [
|
||||||
"black==23.3.0",
|
"black==23.3.0",
|
||||||
"djlint>=1.34.0",
|
"djlint>=1.34.0",
|
||||||
"hatch==1.9.4",
|
"hatch==1.13.0",
|
||||||
"ipdb>=0.13,<0.14",
|
"ipdb>=0.13,<0.14",
|
||||||
"ipython>=8.16,<9",
|
"ipython>=8.16,<9",
|
||||||
"isort==5.11.5",
|
"isort==5.11.5",
|
||||||
|
|
|
@ -60,6 +60,7 @@ def ssl_task(db):
|
||||||
task = models.Task(
|
task = models.Task(
|
||||||
url="https://exemple.com/",
|
url="https://exemple.com/",
|
||||||
domain="https://exemple.com/",
|
domain="https://exemple.com/",
|
||||||
|
method="GET",
|
||||||
check="ssl-certificate-expiration",
|
check="ssl-certificate-expiration",
|
||||||
expected="on-check",
|
expected="on-check",
|
||||||
frequency=1,
|
frequency=1,
|
||||||
|
|
Loading…
Reference in a new issue