Merge branch 'master' into alert-details-task

startreedata · Jan 21, 2025 · 0728a72 · 0728a72
2 parents 6a91c4e + 44a3235
commit 0728a72
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 26 deletions.
diff --git a/jacoco-code-coverage/pom.xml b/jacoco-code-coverage/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jacoco-code-coverage</artifactId>

diff --git a/pinot-test-container/pom.xml b/pinot-test-container/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>thirdeye</artifactId>
         <groupId>ai.startree.thirdeye</groupId>
-        <version>1.411.0-SNAPSHOT</version>
+        <version>1.412.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ai.startree.thirdeye</groupId>
   <artifactId>thirdeye</artifactId>
-  <version>1.411.0-SNAPSHOT</version>
+  <version>1.412.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>thirdeye</name>
 

diff --git a/thirdeye-benchmarks/pom.xml b/thirdeye-benchmarks/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>thirdeye-benchmarks</artifactId>

diff --git a/thirdeye-core/pom.xml b/thirdeye-core/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <artifactId>thirdeye-core</artifactId>
 

diff --git a/thirdeye-dataframe/pom.xml b/thirdeye-dataframe/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/thirdeye-detectionpipeline/pom.xml b/thirdeye-detectionpipeline/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <artifactId>thirdeye-detectionpipeline</artifactId>
 

diff --git a/thirdeye-distribution/pom.xml b/thirdeye-distribution/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye</artifactId>
     <groupId>ai.startree.thirdeye</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-integration-tests/pom.xml b/thirdeye-integration-tests/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye</artifactId>
     <groupId>ai.startree.thirdeye</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-notification/pom.xml b/thirdeye-notification/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <artifactId>thirdeye-notification</artifactId>
 

diff --git a/thirdeye-persistence/pom.xml b/thirdeye-persistence/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye</artifactId>
     <groupId>ai.startree.thirdeye</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/pom.xml b/thirdeye-plugins/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye</artifactId>
     <groupId>ai.startree.thirdeye</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/thirdeye-bootstrap-open-core/pom.xml b/thirdeye-plugins/thirdeye-bootstrap-open-core/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/thirdeye-contributors-simple/pom.xml b/thirdeye-plugins/thirdeye-contributors-simple/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/thirdeye-detectors/pom.xml b/thirdeye-plugins/thirdeye-detectors/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/thirdeye-enumerators/pom.xml b/thirdeye-plugins/thirdeye-enumerators/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/thirdeye-notification-email/pom.xml b/thirdeye-plugins/thirdeye-notification-email/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/thirdeye-oauth/pom.xml b/thirdeye-plugins/thirdeye-oauth/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-plugins/thirdeye-pinot/pom.xml b/thirdeye-plugins/thirdeye-pinot/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/thirdeye-plugins/thirdeye-plugin-example/pom.xml b/thirdeye-plugins/thirdeye-plugin-example/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/thirdeye-plugins/thirdeye-postprocessors/pom.xml b/thirdeye-plugins/thirdeye-postprocessors/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>thirdeye-plugins</artifactId>
     <groupId>ai.startree.thirdeye.plugins</groupId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-scheduler/pom.xml b/thirdeye-scheduler/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <artifactId>thirdeye-scheduler</artifactId>
 

diff --git a/thirdeye-server/pom.xml b/thirdeye-server/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/thirdeye-spi/pom.xml b/thirdeye-spi/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/thirdeye-ui/src/app/components/create-alert-modal/create-alert-modal.component.tsx b/thirdeye-ui/src/app/components/create-alert-modal/create-alert-modal.component.tsx
@@ -110,7 +110,9 @@ export const CreateAlertModal: FunctionComponent<CreateAlertModalModalProps> =
                     okButtonText: t("label.confirm"),
                     cancelButtonText: t("label.cancel"),
                     onOk: () => checkQuota(),
-                    keepDialogOnOk: true,
+                    keepDialogOnOk: !!(
+                        remainingQuota && remainingQuota?.detection <= 0
+                    ),
                 });
             } else {
                 checkQuota();

diff --git a/thirdeye-worker/pom.xml b/thirdeye-worker/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>ai.startree.thirdeye</groupId>
     <artifactId>thirdeye</artifactId>
-    <version>1.411.0-SNAPSHOT</version>
+    <version>1.412.0-SNAPSHOT</version>
   </parent>
   <artifactId>thirdeye-worker</artifactId>