Merge branch 'staging' into azure-subscriptions

atst/app.py

@@ -193,6 +193,7 @@ def map_config(config):
         "CONTRACT_END_DATE": datetime.strptime(
             config.get("default", "CONTRACT_END_DATE"), "%Y-%m-%d"
         ).date(),
+        "SESSION_COOKIE_SECURE": config.getboolean("default", "SESSION_COOKIE_SECURE"),
     }
 
 

atst/forms/task_order.py

@@ -162,11 +162,7 @@ class TaskOrderForm(BaseForm):
         filters=[remove_empty_string, remove_dashes, coerce_upper],
         validators=[AlphaNumeric(), Length(min=13, max=17), Optional()],
     )
-    pdf = FormField(
-        AttachmentForm,
-        label=translate("task_orders.form.supporting_docs_size_limit"),
-        description=translate("task_orders.form.supporting_docs_size_limit"),
-    )
+    pdf = FormField(AttachmentForm)
     clins = FieldList(FormField(CLINForm))
 
 

atst/models/portfolio.py

@@ -22,7 +22,7 @@ class Portfolio(
     id = types.Id()
     name = Column(String, nullable=False)
     defense_component = Column(
-        String, nullable=False
+        ARRAY(String), nullable=False
     )  # Department of Defense Component
 
     app_migration = Column(String)  # App Migration

atst/routes/task_orders/new.py

@@ -24,6 +24,7 @@ def render_task_orders_edit(
 
     render_args["contract_start"] = app.config.get("CONTRACT_START_DATE")
     render_args["contract_end"] = app.config.get("CONTRACT_END_DATE")
+    render_args["file_size_limit"] = int(app.config.get("FILE_SIZE_LIMIT"))
 
     if task_order_id:
         task_order = TaskOrders.get(task_order_id)