Merge branch 'main' into feat-add-event-id-to-alert-dto

pehlicd · Apr 11, 2024 · 7a46ed7 · 7a46ed7
2 parents fa6472e + 6ab7557
commit 7a46ed7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/keep-ui/app/workflows/[workflow_id]/runs/[workflow_execution_id]/page.tsx b/keep-ui/app/workflows/[workflow_id]/runs/[workflow_execution_id]/page.tsx
@@ -139,7 +139,17 @@ export default function WorkflowExecutionPage({
         </Card>
       )}
       <div className={Object.keys(results).length > 0 ? "mt-8" : ""}>
-        {executionStatus === "success" ? (
+        {executionStatus === "in_progress" ? (
+          <div>
+            <div className="flex items-center justify-center">
+              <p>
+                The workflow is in progress, will check again in one second
+                (times checked: {checks})
+              </p>
+            </div>
+            <Loading></Loading>
+          </div>
+        ) : (
           <>
             {error && (
               <Callout
@@ -194,16 +204,6 @@ export default function WorkflowExecutionPage({
               </Table>
             </Card>
           </>
-        ) : (
-          <div>
-            <div className="flex items-center justify-center">
-              <p>
-                The workflow is in progress, will check again in one second
-                (times checked: {checks})
-              </p>
-            </div>
-            <Loading></Loading>
-          </div>
         )}
       </div>
     </div>

diff --git a/keep/api/core/db.py b/keep/api/core/db.py
@@ -44,7 +44,7 @@ def __get_conn() -> pymysql.connections.Connection:
     """
     with Connector() as connector:
         conn = connector.connect(
-            "keephq-sandbox:us-central1:keep",  # Todo: get from configuration
+            os.environ.get("DB_CONNECTION_NAME", "keephq-sandbox:us-central1:keep"),
             "pymysql",
             user="keep-api",
             db="keepdb",
@@ -79,7 +79,7 @@ def __get_conn_impersonate() -> pymysql.connections.Connection:
     # Create a new MySQL connection with the obtained access token
     with Connector() as connector:
         conn = connector.connect(
-            "keephq-sandbox:us-central1:keep",  # Todo: get from configuration
+            os.environ.get("DB_CONNECTION_NAME", "keephq-sandbox:us-central1:keep"),
             "pymysql",
             user="keep-api",
             password=access_token,