Merge branch 'master' into config-table

cloudblue · Jul 25, 2023 · 5d4831f · 5d4831f
2 parents e76a96c + 786ee1c
commit 5d4831f
Show file tree

Hide file tree

Showing 16 changed files with 327 additions and 5,496 deletions.
diff --git a/connect_ext_ppr/models/deployment.py b/connect_ext_ppr/models/deployment.py
@@ -20,7 +20,7 @@ class Deployment(Model):
 
     PREFIX = 'DPL'
 
-    STATUS = DeploymentStatusChoices
+    STATUSES = DeploymentStatusChoices
 
     id = db.Column(db.String(20), primary_key=True)
     product_id = db.Column(db.String, db.ForeignKey(Product.id))
@@ -29,7 +29,7 @@ class Deployment(Model):
     vendor_id = db.Column(db.String(20))
     status = db.Column(
         db.Enum(DeploymentStatusChoices, validate_strings=True),
-        default=STATUS.pending,
+        default=STATUSES.pending,
     )
     last_sync_at = db.Column(db.DateTime(), default=datetime.utcnow)
     created_at = db.Column(db.DateTime(), default=datetime.utcnow)
@@ -43,14 +43,14 @@ class DeploymentRequest(Model):
 
     PREFIX = 'DPLR'
 
-    STATUS = DeploymentRequestStatusChoices
+    STATUSES = DeploymentRequestStatusChoices
 
     id = db.Column(db.String(20), primary_key=True)
     deployment_id = db.Column(db.ForeignKey(Deployment.id))
     ppr_id = db.Column(db.String, db.ForeignKey(PPRVersion.id))
     status = db.Column(
         db.Enum(DeploymentRequestStatusChoices, validate_strings=True),
-        default=STATUS.pending,
+        default=STATUSES.pending,
     )
     manually = db.Column(db.Boolean(), default=False)
     delegate_l2 = db.Column(db.Boolean(), default=False)

diff --git a/connect_ext_ppr/models/enums.py b/connect_ext_ppr/models/enums.py
@@ -25,9 +25,9 @@ class TasksStatusChoices(str, enum.Enum):
 
 
 class TaskTypesChoices(str, enum.Enum):
-    PPR_VALIDATION = 'ppr_validation'
-    APPLY_AND_DELEGATE = 'apply_ppr_and_delegate_to_marketplace'
-    DELEGATE_TO_L2 = 'delegate_to_l2'
+    ppr_validation = 'ppr_validation'
+    apply_and_delegate = 'apply_ppr_and_delegate_to_marketplace'
+    delegate_to_l2 = 'delegate_to_l2'
 
 
 class MimeTypeChoices(str, enum.Enum):

diff --git a/connect_ext_ppr/models/task.py b/connect_ext_ppr/models/task.py
@@ -12,12 +12,12 @@ class Task(Model):
 
     PREFIX = 'TSK'
 
-    STATUS = TasksStatusChoices
+    STATUSES = TasksStatusChoices
 
     id = db.Column(db.String(30), primary_key=True)
     status = db.Column(
         db.Enum(TasksStatusChoices, validate_strings=True),
-        default=STATUS.pending,
+        default=STATUSES.pending,
     )
     deployment_request = db.Column(db.ForeignKey(DeploymentRequest.id))
     title = db.Column(db.String(100))

diff --git a/...eployment-details.0ef55e9ba6d0799e3f2a.js → ...eployment-details.4192750352567f86f23f.js b/...eployment-details.0ef55e9ba6d0799e3f2a.js → ...eployment-details.4192750352567f86f23f.js
diff --git a/connect_ext_ppr/static/images/mkp.svg b/connect_ext_ppr/static/images/mkp.svg
diff --git a/..._ppr/static/index.4902e9c6731130d1bc1b.js → ..._ppr/static/index.1ba41af3fe9b9192332e.js b/..._ppr/static/index.4902e9c6731130d1bc1b.js → ..._ppr/static/index.1ba41af3fe9b9192332e.js