Skip to content

Commit

Permalink
feat: merge
Browse files Browse the repository at this point in the history
Signed-off-by: suzhou <[email protected]>
  • Loading branch information
SuZhou-Joe committed Jan 4, 2023
2 parents 3f70840 + 564b77a commit 352794d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion public/pages/CreateIndex/containers/IndexForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { diffArrays } from "diff";
import React, { Component, forwardRef, useContext } from "react";
import { EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiButton, EuiButtonEmpty, EuiLoadingSpinner } from "@elastic/eui";
import { get, set, differenceWith, isEqual, merge } from "lodash";
import { diffArrays } from "diff";
import flattern from "flat";
import IndexDetail, { IndexDetailProps, IIndexDetailRef, defaultIndexSettings } from "../../components/IndexDetail";
import { IAliasAction, IndexItem, IndexItemRemote, MappingsProperties } from "../../../../../models/interfaces";
Expand Down
10 changes: 6 additions & 4 deletions public/pages/IndexDetail/containers/IndexDetail/IndexDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ const OVERVIEW_DISPLAY_INFO: {
},
{
label: "Health",
value: "health",
},
{
label: "Status",
value: ({ detail }) => {
const health = detail.health;
const color = health ? HEALTH_TO_COLOR[health] : "subdued";
Expand All @@ -65,6 +61,12 @@ const OVERVIEW_DISPLAY_INFO: {
);
},
},
{
label: "Status",
value: ({ detail }) => {
return <span className="camel-first-letter">{detail.status}</span>;
},
},
{
label: "Creation date",
value: ({ detail }) => (
Expand Down
4 changes: 4 additions & 0 deletions public/pages/Indices/containers/Indices/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
.euiFlexItem--flexGrowZero {
text-transform: capitalize;
}
}

.camel-first-letter {
text-transform: capitalize;
}
2 changes: 1 addition & 1 deletion public/pages/Indices/utils/constants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const getColumns = (props: IColumnOptions): EuiTableFieldDataColumnType<ManagedC
truncateText: true,
textOnly: true,
render: (status: string, item: ManagedCatIndex) => {
return item.extraStatus || status;
return <span className="camel-first-letter">{item.extraStatus || status}</span>;
},
},
{
Expand Down

0 comments on commit 352794d

Please sign in to comment.