Optimize for v2.6 (#640)

* feat: add copyright to all the files Signed-off-by: suzhou <[email protected]> * feat: wording update Signed-off-by: suzhou <[email protected]> * fix: xxx has been selected issue Signed-off-by: suzhou <[email protected]> * feat: add force merge in aliases and data streams page Signed-off-by: suzhou <[email protected]> --------- Signed-off-by: suzhou <[email protected]>
opensearch-project · Feb 22, 2023 · 2beb50e · 2beb50e
1 parent e3fe789
commit 2beb50e
Show file tree

Hide file tree

Showing 99 changed files with 534 additions and 75 deletions.
diff --git a/cypress/integration/aliases.js b/cypress/integration/aliases.js
@@ -59,7 +59,7 @@ describe("Aliases", () => {
 
   describe("can create a alias with wildcard and specific name", () => {
     it("successfully", () => {
-      cy.get('[data-test-subj="Create AliasButton"]').click();
+      cy.get('[data-test-subj="Create aliasButton"]').click();
       cy.get('[data-test-subj="form-name-alias"]').type(CREATE_ALIAS);
       cy.get('[data-test-subj="form-name-indexArray"] [data-test-subj="comboBoxSearchInput"]').type(
         `${EDIT_INDEX}{enter}${SAMPLE_INDEX_PREFIX}-*{enter}`

diff --git a/cypress/integration/rollover.js b/cypress/integration/rollover.js
@@ -55,7 +55,7 @@ describe("Rollover", () => {
       // click create
       cy.get('[data-test-subj="rolloverSubmitButton"]').click({ force: true });
 
-      cy.contains(/has been successfully rollover./);
+      cy.contains(/has been successfully rolled over./);
     });
 
     it("rollover valid alias successfully", () => {
@@ -66,7 +66,7 @@ describe("Rollover", () => {
       // click create
       cy.get('[data-test-subj="rolloverSubmitButton"]').click({ force: true });
 
-      cy.contains(/has been successfully rollover./);
+      cy.contains(/has been successfully rolled over./);
     });
 
     it("rollover invalid alias successfully", () => {
@@ -84,7 +84,7 @@ describe("Rollover", () => {
       // click create
       cy.get('[data-test-subj="rolloverSubmitButton"]').click({ force: true });
 
-      cy.contains(/has been successfully rollover./);
+      cy.contains(/has been successfully rolled over./);
     });
   });
 

diff --git a/public/JobHandler/callbacks/reindex.tsx b/public/JobHandler/callbacks/reindex.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { ReactChild } from "react";
 import { CallbackType } from "../interface";
 import { ReindexJobMetaData } from "../../models/interfaces";

diff --git a/public/JobHandler/callbacks/shrink.tsx b/public/JobHandler/callbacks/shrink.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React from "react";
 import { CallbackType } from "../interface";
 import { RecoveryJobMetaData } from "../../models/interfaces";

diff --git a/public/JobHandler/callbacks/split.tsx b/public/JobHandler/callbacks/split.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React from "react";
 import { CallbackType } from "../interface";
 import { RecoveryJobMetaData } from "../../models/interfaces";

diff --git a/public/JobHandler/components/DetailLink.tsx b/public/JobHandler/components/DetailLink.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React from "react";
 import { EuiLink } from "@elastic/eui";
 import { ROUTES } from "../../utils/constants";

diff --git a/public/JobHandler/index.ts b/public/JobHandler/index.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { jobSchedulerInstance } from "../context/JobSchedulerContext";
 import { CoreSetup } from "../../../../src/core/public";
 import { callbackForReindex, callbackForReindexTimeout } from "./callbacks/reindex";

diff --git a/public/JobHandler/interface.ts b/public/JobHandler/interface.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { IJobItemMetadata } from "../lib/JobScheduler/interface";
 import { CoreSetup } from "../../../../src/core/public";
 

diff --git a/public/JobHandler/utils.ts b/public/JobHandler/utils.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 export const EVENT_MAP = {
   REINDEX_COMPLETE: "REINDEX_COMPLETE",
   SPLIT_COMPLETE: "SPLIT_COMPLETE",

diff --git a/public/components/AdvancedSettings/index.scss b/public/components/AdvancedSettings/index.scss
@@ -1,5 +1,9 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .accordion-in-advanced-settings.euiAccordion-isOpen {
     .euiAccordion__childWrapper {
         transform: none!important;
     }
-}
+}
diff --git a/public/components/AdvancedSettings/index.tsx b/public/components/AdvancedSettings/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef } from "react";
 import { EuiAccordion, EuiAccordionProps, EuiSpacer, EuiFormRowProps } from "@elastic/eui";
 import SwitchableEditor, { SwitchableEditorProps, ISwitchableEditorRef } from "../SwitchableEditor";

diff --git a/public/components/ComboBoxWithoutWarning/index.tsx b/public/components/ComboBoxWithoutWarning/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { EuiComboBox, EuiComboBoxProps } from "@elastic/eui";
 
 /**

diff --git a/public/components/CustomFormRow/index.tsx b/public/components/CustomFormRow/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React from "react";
 import { EuiDescribedFormGroup, EuiFormRow, EuiFormRowProps } from "@elastic/eui";
 

diff --git a/public/components/DescriptionListHoz/DescriptionListHoz.tsx b/public/components/DescriptionListHoz/DescriptionListHoz.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { EuiDescriptionList, EuiDescriptionListProps, EuiFlexGrid, EuiFlexGridProps, EuiFlexItem } from "@elastic/eui";
 import React from "react";
 

diff --git a/public/components/DescriptionListHoz/index.ts b/public/components/DescriptionListHoz/index.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import DescriptionListHoz from "./DescriptionListHoz";
 
 export default DescriptionListHoz;
diff --git a/public/components/EuiToolTipWrapper/index.tsx b/public/components/EuiToolTipWrapper/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { forwardRef } from "react";
 import ToolTipWithoutWarning from "../ToolTipWithoutWarning";
 

diff --git a/public/components/FormGenerator/built_in_components/index.tsx b/public/components/FormGenerator/built_in_components/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { forwardRef, useRef } from "react";
 import { EuiFieldNumber, EuiFieldText, EuiSwitch, EuiSelect, EuiText, EuiCheckbox } from "@elastic/eui";
 import EuiToolTipWrapper, { IEuiToolTipWrapperProps } from "../../EuiToolTipWrapper";

diff --git a/public/components/FormGenerator/index.tsx b/public/components/FormGenerator/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { forwardRef, useRef, useImperativeHandle, useEffect, useMemo } from "react";
 import { EuiForm, EuiFormProps, EuiSpacer } from "@elastic/eui";
 import { isEqual, omit, pick } from "lodash";

diff --git a/public/components/IndexMapping/IndexMapping.scss b/public/components/IndexMapping/IndexMapping.scss
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .index-mapping-tree {
     .euiTreeView__node {
         max-height: unset;
@@ -16,4 +20,4 @@
         margin-right: 8px;
         vertical-align: middle;
     }
-}
+}
diff --git a/public/components/IndexMapping/helper.ts b/public/components/IndexMapping/helper.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { MappingsProperties, MappingsPropertiesObject } from "../../../models/interfaces";
 
 export const transformObjectToArray = (obj: MappingsPropertiesObject): MappingsProperties => {

diff --git a/public/components/IndexMapping/interfaces.ts b/public/components/IndexMapping/interfaces.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { MappingsProperties, MappingsPropertiesObject } from "../../../models/interfaces";
 
 export type IndexMappingsAll = {

diff --git a/public/components/JSONDiffEditor/JSONDiffEditor.scss b/public/components/JSONDiffEditor/JSONDiffEditor.scss
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .json-diff-editor-validate-error {
     outline: 1px solid red;
-}
+}
diff --git a/public/components/JSONDiffEditor/interface.ts b/public/components/JSONDiffEditor/interface.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import type { MonacoDiffEditorProps } from "react-monaco-editor";
 import { JSONEditorProps } from "../JSONEditor";
 

diff --git a/public/components/MappingLabel/MappingLabel.tsx b/public/components/MappingLabel/MappingLabel.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { forwardRef, useCallback, useRef, useImperativeHandle } from "react";
 import {
   EuiIcon,

diff --git a/public/components/MappingLabel/index.ts b/public/components/MappingLabel/index.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import MappingLabel from "./MappingLabel";
 
 export default MappingLabel;

diff --git a/public/components/SwitchableEditor/SwitchableEditor.scss b/public/components/SwitchableEditor/SwitchableEditor.scss
@@ -1,6 +1,10 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 .switch-diff-editor-modal {
     .euiModal__flex {
         max-height: unset;
         overflow-y: unset;
     }
-}
+}
diff --git a/public/components/Toast/index.tsx b/public/components/Toast/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { useEffect, useState } from "react";
 import { render } from "react-dom";
 import { EuiGlobalToastList, EuiGlobalToastListProps } from "@elastic/eui";

diff --git a/public/components/ToolTipWithoutWarning/index.tsx b/public/components/ToolTipWithoutWarning/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { EuiToolTip } from "@elastic/eui";
 
 /**

diff --git a/public/components/UnsavedChangesBottomBar/UnsavedChangesBottomBar.tsx b/public/components/UnsavedChangesBottomBar/UnsavedChangesBottomBar.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { useEffect, useRef, useState } from "react";
 import { EuiButton, EuiBottomBar, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from "@elastic/eui";
 

diff --git a/public/components/UnsavedChangesBottomBar/index.ts b/public/components/UnsavedChangesBottomBar/index.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import UnsavedChangesBottomBar from "./UnsavedChangesBottomBar";
 
 export default UnsavedChangesBottomBar;
diff --git a/public/containers/IndexDetail/index.tsx b/public/containers/IndexDetail/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { EuiSpacer } from "@elastic/eui";
 import React, { useContext, useEffect, useState } from "react";
 import { CatIndex } from "../../../server/models/interfaces";

diff --git a/public/context/JobSchedulerContext.tsx b/public/context/JobSchedulerContext.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React from "react";
 import { JobScheduler } from "../lib/JobScheduler";
 

diff --git a/public/lib/JobScheduler/JobScheduler.ts b/public/lib/JobScheduler/JobScheduler.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { IJobSchedulerOptions, IJobItemMetadata, IStorage, JobItemMetadata, TimeoutId } from "./interface";
 import { StoreLocalStorage } from "./store-localstorage";
 

diff --git a/public/lib/JobScheduler/index.ts b/public/lib/JobScheduler/index.ts
@@ -1,2 +1,6 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 export * from "./interface";
 export { JobScheduler } from "./JobScheduler";
diff --git a/public/lib/JobScheduler/interface.ts b/public/lib/JobScheduler/interface.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 export interface IJobItemMetadata {
   interval: number;
   extras: any; // extra fields to store job-related info

diff --git a/public/lib/JobScheduler/store-localstorage.ts b/public/lib/JobScheduler/store-localstorage.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { IStorage, JobItemMetadata } from "./interface";
 
 const JOB_STORAGE_KEY = "ISM_JOBS";

diff --git a/public/lib/field/index.tsx b/public/lib/field/index.tsx
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { useEffect, useRef, useState } from "react";
 import { set, get, unset } from "lodash";
 import { Rule, FieldOption, FieldInstance, InitOption, InitResult, ValidateFunction, FieldName } from "./interfaces";

diff --git a/public/lib/field/interfaces.ts b/public/lib/field/interfaces.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React from "react";
 
 // if it's a string[], the value will become nested.

diff --git a/public/lib/field/messages.ts b/public/lib/field/messages.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 export default {
   default: "%s verification failed",
   required: "%s is a required field",

diff --git a/public/lib/field/rules/index.ts b/public/lib/field/rules/index.ts
@@ -1,10 +1,14 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import { ValidateFunction } from "../interfaces";
 import messages from "../messages";
 import { format as messageFormat } from "../util";
 
 const pattern = {
-  email: /[\w\u4E00-\u9FA5]+([-+.][\w\u4E00-\u9FA5]+)*@[\w\u4E00-\u9FA5]+([-.][\w\u4E00-\u9FA5]+)*\.[\w\u4E00-\u9FA5]+([-.][\w\u4E00-\u9FA5]+)*/,
-  url: /^(?:(?:http|https|ftp):\/\/|\/\/)(?:(?:(?:[-\w\u00a1-\uffff]+)(?:\.[-\w\u00a1-\uffff]+)+|localhost)(?::\d{2,5})?(?:(?:\/|#)[^\s]*)?)$/,
+  email: /[\w一-龥]+([-+.][\w一-龥]+)*@[\w一-龥]+([-.][\w一-龥]+)*\.[\w一-龥]+([-.][\w一-龥]+)*/,
+  url: /^(?:(?:http|https|ftp):\/\/|\/\/)(?:(?:(?:[-\w¡-]+)(?:\.[-\w¡-]+)+|localhost)(?::\d{2,5})?(?:(?:\/|#)[^\s]*)?)$/,
   number: /\d*/,
   tel: /^(1\d{10})$|(((400)-(\d{3})-(\d{4}))|^((\d{7,8})|(\d{3,4})-(\d{7,8})|(\d{7,8})-(\d{1,4}))$)$|^([ ]?)$/,
 };

diff --git a/public/lib/field/util.ts b/public/lib/field/util.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 const formatRegExp = /%[sdj%]/g;
 
 export function format(...args: string[]) {

diff --git a/public/pages/Aliases/containers/AliasActions/index.tsx b/public/pages/Aliases/containers/AliasActions/index.tsx
@@ -54,7 +54,14 @@ export default function AliasesActions(props: AliasesActionsProps) {
                   onClick: onUpdateAlias,
                 },
                 {
-                  name: "Rollover",
+                  name: "Force merge",
+                  "data-test-subj": "ForceMergeAction",
+                  onClick: () => {
+                    props.history.push(`${ROUTES.FORCE_MERGE}/${selectedItems.map((item) => item.alias).join(",")}`);
+                  },
+                },
+                {
+                  name: "Roll over",
                   disabled: selectedItems.length > 1,
                   "data-test-subj": "rolloverAction",
                   onClick: () => history.push(selectedItems.length ? `${ROUTES.ROLLOVER}/${selectedItems[0].alias}` : ROUTES.ROLLOVER),