From ad4b9dc650a66b51d4f5ec27a84ed168597d12cc Mon Sep 17 00:00:00 2001 From: shahargl Date: Wed, 23 Oct 2024 12:18:37 +0300 Subject: [PATCH 1/3] fix: cancel creates the rule --- keep-ui/app/deduplication/DeduplicationSidebar.tsx | 1 + .../migrations/versions/2024-10-22-10-38_8438f041ee0e.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/keep-ui/app/deduplication/DeduplicationSidebar.tsx b/keep-ui/app/deduplication/DeduplicationSidebar.tsx index c09d86e00..0a3bf8943 100644 --- a/keep-ui/app/deduplication/DeduplicationSidebar.tsx +++ b/keep-ui/app/deduplication/DeduplicationSidebar.tsx @@ -535,6 +535,7 @@ const DeduplicationSidebar: React.FC = ({ color="orange" variant="secondary" onClick={handleToggle} + type="button" className="border border-orange-500 text-orange-500" > Cancel diff --git a/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py b/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py index eae0abfc5..ad17b6f18 100644 --- a/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py +++ b/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py @@ -19,9 +19,16 @@ def upgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### with op.batch_alter_table("provider", schema=None) as batch_op: + # First add the column as nullable with a default value batch_op.add_column( - sa.Column("pulling_enabled", sa.Boolean(), nullable=False, default=True) + sa.Column( + "pulling_enabled", sa.Boolean(), server_default=sa.true(), nullable=True + ) ) + + # Then make it not nullable if needed + with op.batch_alter_table("provider", schema=None) as batch_op: + batch_op.alter_column("pulling_enabled", nullable=False) # ### end Alembic commands ### From 4971bb319221d6726accde41ae780a6d8620c3bb Mon Sep 17 00:00:00 2001 From: shahargl Date: Wed, 23 Oct 2024 12:19:26 +0300 Subject: [PATCH 2/3] feat: wip --- .../migrations/versions/2024-10-22-10-38_8438f041ee0e.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py b/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py index ad17b6f18..eae0abfc5 100644 --- a/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py +++ b/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py @@ -19,16 +19,9 @@ def upgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### with op.batch_alter_table("provider", schema=None) as batch_op: - # First add the column as nullable with a default value batch_op.add_column( - sa.Column( - "pulling_enabled", sa.Boolean(), server_default=sa.true(), nullable=True - ) + sa.Column("pulling_enabled", sa.Boolean(), nullable=False, default=True) ) - - # Then make it not nullable if needed - with op.batch_alter_table("provider", schema=None) as batch_op: - batch_op.alter_column("pulling_enabled", nullable=False) # ### end Alembic commands ### From 75a5cc44532bf4f8fad8896da392e35e74c1b40c Mon Sep 17 00:00:00 2001 From: shahargl Date: Wed, 23 Oct 2024 12:20:00 +0300 Subject: [PATCH 3/3] fix: cancel creates the rule --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1f3adec36..5546b50e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "keep" -version = "0.27.0" +version = "0.27.1" description = "Alerting. for developers, by developers." authors = ["Keep Alerting LTD"] readme = "README.md"