[BugFix] Make rollover alias optional when attaching policy to data stream

.github/workflows/cypress-workflow.yml

@@ -7,7 +7,7 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.4.0'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.4'
   OPENSEARCH_VERSION: '2.4.0-SNAPSHOT'
 jobs:
   tests:

.github/workflows/unit-tests-workflow.yml

@@ -7,7 +7,7 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.4.0'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.4'
 jobs:
   tests:
     name: Run unit tests

opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "indexManagementDashboards",
-  "version": "2.4.0.0",
-  "opensearchDashboardsVersion": "2.4.0",
+  "version": "2.4.1",
+  "opensearchDashboardsVersion": "2.4.1",
   "configPath": ["opensearch_index_management"],
   "requiredPlugins": ["navigation"],
   "server": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensearch_index_management_dashboards",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Opensearch Dashboards plugin for Index Management",
   "main": "index.js",
   "license": "Apache-2.0",
@@ -46,7 +46,9 @@
     "minimist": "^1.2.6",
     "moment": "^2.29.4",
     "async": "^3.2.3",
-    "terser": "^4.8.1"
+    "terser": "^4.8.1",
+    "ts-loader": "^8.4.0",
+    "webpack": "^5.75.0"
   },
   "devDependencies": {
     "@elastic/elastic-eslint-config-kibana": "link:../../packages/opensearch-eslint-config-opensearch-dashboards",

public/pages/Indices/components/ApplyPolicyModal/ApplyPolicyModal.tsx

@@ -44,7 +44,6 @@ interface ApplyPolicyModalState {
   hasRolloverAction: boolean;
   policyOptions: PolicyOption[];
   rolloverAlias: string;
-  rolloverAliasError: string;
   hasSubmitted: boolean;
 }
 
@@ -57,7 +56,6 @@ export default class ApplyPolicyModal extends Component<ApplyPolicyModalProps, A
     hasRolloverAction: false,
     policyOptions: [],
     rolloverAlias: "",
-    rolloverAliasError: "",
     hasSubmitted: false,
   };
 
@@ -159,39 +157,29 @@ export default class ApplyPolicyModal extends Component<ApplyPolicyModalProps, A
     const rolloverAlias = e.target.value;
     this.setState({
       rolloverAlias,
-      rolloverAliasError: this.getRolloverAliasError(rolloverAlias),
     });
   };
 
   onSubmit = async (): Promise<void> => {
     const { selectedPolicy, rolloverAlias } = this.state;
     const selectedPolicyError = this.getSelectedPolicyError(selectedPolicy);
-    const rolloverAliasError = this.getRolloverAliasError(rolloverAlias);
-    const hasSubmitError = !!selectedPolicyError || !!rolloverAliasError;
+    const hasSubmitError = !!selectedPolicyError;
+
     if (hasSubmitError) {
-      this.setState({ selectedPolicyError, rolloverAliasError, hasSubmitted: true });
+      this.setState({ selectedPolicyError, hasSubmitted: true });
     } else {
       // @ts-ignore
       await this.onApplyPolicy(selectedPolicy, this.hasRolloverAction(selectedPolicy), rolloverAlias);
     }
   };
 
-  getRolloverAliasError = (rolloverAlias: string): string => {
-    const { hasRolloverAction } = this.state;
-    const { indices } = this.props;
-    const hasSingleIndexSelected = indices.length === 1;
-    const requiresAlias = hasRolloverAction && hasSingleIndexSelected;
-    const hasAliasError = requiresAlias && !rolloverAlias;
-    return hasAliasError ? "Required" : "";
-  };
-
   getSelectedPolicyError = (selectedPolicy: PolicyOption | null): string => (selectedPolicy ? "" : "You must select a policy");
 
   hasRolloverAction = (selectedPolicy: PolicyOption | null): boolean =>
     _.get(selectedPolicy, "policy.states", []).some((state: State) => state.actions.some((action) => action.hasOwnProperty("rollover")));
 
   renderRollover = (): React.ReactNode | null => {
-    const { rolloverAlias, hasRolloverAction, rolloverAliasError, hasSubmitted } = this.state;
+    const { rolloverAlias, hasRolloverAction } = this.state;
     const { indices } = this.props;
     const hasSingleIndexSelected = indices.length === 1;
 
@@ -204,24 +192,16 @@ export default class ApplyPolicyModal extends Component<ApplyPolicyModalProps, A
           helpText={
             <EuiText size="xs" grow={false}>
               <p>
-                This policy includes a rollover action. Specify a rollover alias.{" "}
+                This policy includes a rollover action. Specify a rollover alias - (optional).{" "}
                 <EuiLink href={DOCUMENTATION_URL} target="_blank" rel="noopener noreferrer">
                   Learn more <EuiIcon type="popout" size="s" />
                 </EuiLink>
               </p>
             </EuiText>
           }
-          isInvalid={hasSubmitted && !!rolloverAliasError}
-          error={rolloverAliasError}
           fullWidth
         >
-          <EuiFieldText
-            isInvalid={hasSubmitted && !!rolloverAliasError}
-            placeholder="Rollover alias"
-            value={rolloverAlias}
-            onChange={this.onChangeRolloverAlias}
-            fullWidth
-          />
+          <EuiFieldText placeholder="Rollover alias" value={rolloverAlias} onChange={this.onChangeRolloverAlias} fullWidth />
         </EuiFormRow>
       );
     }

yarn.lock

@@ -2120,10 +2120,12 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
 
 jsonfile@^6.0.1:
   version "6.1.0"
@@ -2228,14 +2230,14 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^1.0.2, loader-utils@^2.0.0, loader-utils@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
+loader-utils@^1.0.2, loader-utils@^1.4.1, loader-utils@^2.0.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
-    json5 "^2.1.2"
+    json5 "^1.0.1"
 
 locate-path@^5.0.0:
   version "5.0.0"
@@ -2404,7 +2406,7 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==