fix(ui): TE-XX fixed regression issues in create alert

startreedata · Nov 25, 2024 · d1d006f · d1d006f
1 parent f2b5cc4
commit d1d006f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.../app/components/alert-composite-filters-modal/alert-composite-filters-modal.component.tsx b/.../app/components/alert-composite-filters-modal/alert-composite-filters-modal.component.tsx
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-import { Box, Button, Grid } from "@material-ui/core";
+import { Grid } from "@material-ui/core";
 import { isEqual } from "lodash";
 import React, { FunctionComponent, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -176,9 +176,12 @@ export const AlertCompositeFiltersModal: FunctionComponent<AlertCompositeFilters
         return (
             <Modal
                 initiallyOpen
+                disableSubmitButton={selectedCohorts.length === 0}
                 maxWidth="md"
+                submitButtonLabel={t("label.add-selected-dimensions")}
                 title={t("label.add-dimensions")}
                 onCancel={onCancel}
+                onSubmit={handleCreateBtnClick}
             >
                 <Grid item xs={12}>
                     <DatasetDetails
@@ -213,17 +216,7 @@ export const AlertCompositeFiltersModal: FunctionComponent<AlertCompositeFilters
                         getCohortsRequestStatus={status}
                         initiallySelectedCohorts={initiallySelectedCohorts}
                         onSelectionChange={handleCohortsSelectionChange}
-                    >
-                        <Box textAlign="right">
-                            <Button
-                                color="primary"
-                                disabled={selectedCohorts.length === 0}
-                                onClick={handleCreateBtnClick}
-                            >
-                                {t("label.add-selected-dimensions")}
-                            </Button>
-                        </Box>
-                    </CohortsTable>
+                    />
                 </Grid>
             </Modal>
         );

diff --git a/...ye-ui/src/app/components/alert-wizard-v3/threshold-setup/threshold-setup-v3.component.tsx b/...ye-ui/src/app/components/alert-wizard-v3/threshold-setup/threshold-setup-v3.component.tsx
@@ -224,7 +224,7 @@ export const ThresholdSetupV3: FunctionComponent<ThresholdSetupProps> = ({
                 disableReload={
                     unsetProperties.length > 0 || invalidProperties.length > 0
                 }
-                hasAutoReload={false}
+                hasAutoReload={!!algorithmOptionConfig?.recommendationId}
                 onAlertPropertyChange={onAlertPropertyChange}
             />
         </PageContentsCardV1>