-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
change display component of the region in the service template detail…
…s. (#1128)
- Loading branch information
Showing
6 changed files
with
144 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * SPDX-FileCopyrightText: Huawei Inc. | ||
| */ | ||
|
|
||
| import { Table, TableProps, Tag } from 'antd'; | ||
| import React from 'react'; | ||
| import regionStyle from '../../../../styles/region-text.module.css'; | ||
| import { Region } from '../../../../xpanse-api/generated'; | ||
| import { GroupedRegionItem, groupedRegions } from '../../../utils/groupedRegions.tsx'; | ||
|
|
||
| const columns: TableProps<GroupedRegionItem>['columns'] = [ | ||
| { | ||
| title: 'Area', | ||
| dataIndex: 'area', | ||
| key: 'area', | ||
| render: (text) => <Tag color={'green'}>{text}</Tag>, | ||
| }, | ||
| { | ||
| title: 'Region', | ||
| dataIndex: 'name', | ||
| key: 'region', | ||
| render: (_, { name }) => ( | ||
| <> | ||
| {name.map((item) => { | ||
| return ( | ||
| <Tag color={'blue'} key={item}> | ||
| {item} | ||
| </Tag> | ||
| ); | ||
| })} | ||
| </> | ||
| ), | ||
| }, | ||
| { | ||
| title: 'Site', | ||
| dataIndex: 'site', | ||
| key: 'site', | ||
| render: (_, { site }) => ( | ||
| <> | ||
| {site.map((item) => { | ||
| return ( | ||
| <Tag color={'orange'} key={item}> | ||
| {item} | ||
| </Tag> | ||
| ); | ||
| })} | ||
| </> | ||
| ), | ||
| }, | ||
| ]; | ||
|
|
||
| export function RegionText({ regions }: { regions: Region[] }): React.JSX.Element { | ||
| if (regions.length > 1) { | ||
| const groupedByAreaRegions = groupedRegions(regions); | ||
| return ( | ||
| <div className={regionStyle.regionList}> | ||
| <Table | ||
| columns={columns} | ||
| dataSource={groupedByAreaRegions} | ||
| rowKey={'id'} | ||
| pagination={false} | ||
| bordered={true} | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| return <></>; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * SPDX-FileCopyrightText: Huawei Inc. | ||
| */ | ||
|
|
||
| import { Region } from '../../xpanse-api/generated'; | ||
|
|
||
| export interface GroupedRegionItem { | ||
| /** | ||
| * The names of the region | ||
| */ | ||
| name: string[]; | ||
| /** | ||
| * The sites with the region belongs to, such as default, Chinese Mainland, International, | ||
| */ | ||
| site: string[]; | ||
| /** | ||
| * The area which the region belongs to, such as Asia, Europe, Africa | ||
| */ | ||
| area: string; | ||
| } | ||
|
|
||
| export const groupedRegions = (regions: Region[]): GroupedRegionItem[] => { | ||
| const groupedData: Record<string, GroupedRegionItem> = {}; | ||
|
|
||
| regions.forEach((item) => { | ||
| const groupKey = `${item.name}-${item.area}`; | ||
|
|
||
| if (!(groupKey in groupedData)) { | ||
| groupedData[groupKey] = { | ||
| name: [item.name], | ||
| site: [item.site], | ||
| area: item.area, | ||
| }; | ||
| } else { | ||
| if (!groupedData[groupKey].site.includes(item.site)) { | ||
| groupedData[groupKey].site.push(item.site); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| return Object.values(groupedData); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * SPDX-FileCopyrightText: Huawei Inc. | ||
| */ | ||
|
|
||
| .region-list { | ||
| margin-top: 5px; | ||
| width: 100%; | ||
| } |