Skip to content

fix(common): msp project detail display bug in orgCenter #2351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2021
Merged

fix(common): msp project detail display bug in orgCenter #2351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 31 additions & 23 deletions shell/app/modules/org/pages/projects/settings/info/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,15 @@ const Info = () => {
header={
<div>
{i18n.t('dop:basic information')}
<Tooltip title={i18n.t('projects')}>
<CustomIcon
type="link1"
className="ml-2 hover-active"
onClick={() => goTo(goTo.pages.project, { projectId: info.id })}
/>
</Tooltip>
{notMSP ? (
<Tooltip title={i18n.t('projects')}>
<CustomIcon
type="link1"
className="ml-2 hover-active"
onClick={() => goTo(goTo.pages.project, { projectId: info.id })}
/>
</Tooltip>
) : null}
</div>
}
actions={
Expand Down Expand Up @@ -329,24 +331,30 @@ const Info = () => {
<Card
header={i18n.t('advanced settings')}
actions={
<span className="hover-active" onClick={() => setProjectRollbackEditVisible(true)}>
<ErdaIcon type="edit" size={16} className="mr-2 align-middle" />
</span>
notMSP ? (
<span className="hover-active" onClick={() => setProjectRollbackEditVisible(true)}>
<ErdaIcon type="edit" size={16} className="mr-2 align-middle" />
</span>
) : null
}
>
<div className="label">{i18n.t('dop:rollback setting')}</div>
<Row className="erda-panel-list">
{Object.keys(info.rollbackConfig || {}).map((key: string) => (
<Col span={6} className="flex">
<div className="flex mr-3">{resourceIconMap[key]}</div>
<div>
<div className="label">{info.rollbackConfig[key]}</div>
<div className="text-xs">{resourceMap[key]}</div>
</div>
</Col>
))}
</Row>
<div className="label">{i18n.t('other settings')}</div>
{notMSP ? (
<>
<div className="label">{i18n.t('dop:rollback setting')}</div>
<Row className="erda-panel-list">
{Object.keys(info.rollbackConfig || {}).map((key: string) => (
<Col span={6} className="flex">
<div className="flex mr-3">{resourceIconMap[key]}</div>
<div>
<div className="label">{info.rollbackConfig[key]}</div>
<div className="text-xs">{resourceMap[key]}</div>
</div>
</Col>
))}
</Row>
<div className="label">{i18n.t('other settings')}</div>
</>
) : null}
<Row>
<Col span={12} className="pr-2">
<div className="erda-panel-list flex justify-between items-center">
Expand Down