diff --git a/src/webview/git-import/app/cardItem.style.tsx b/src/webview/git-import/app/cardItem.style.tsx index fb3ed2b78..06e0324b0 100644 --- a/src/webview/git-import/app/cardItem.style.tsx +++ b/src/webview/git-import/app/cardItem.style.tsx @@ -5,7 +5,7 @@ import { Theme, createStyles } from '@material-ui/core/styles'; -export default (theme: Theme) => +export default (_theme: Theme) => createStyles({ card: { display: 'inline-table', @@ -43,17 +43,17 @@ export default (theme: Theme) => }, cardBody: { height: 'auto', + width: '50%', overflow: 'hidden', margin: '1.5rem 1rem' }, cardRegistryTitle: { - color: 'var(--vscode-textLink-activeForeground)', minWidth: '5rem', height: '2rem', whiteSpace: 'nowrap', overflow: 'hidden', display: 'block', - textAlign: 'left', + textAlign: 'right', textDecoration: 'none', textOverflow: 'ellipsis', wordBreak: 'break-all', @@ -62,38 +62,12 @@ export default (theme: Theme) => margin: '1rem' }, badge: { - minWidth: '0.5rem', - maxWidth: '5rem', + height: '1px', padding: '0.5rem', - minHeight: '2px', - maxHeight: '1rem', borderRadius: '0.5rem!important', - marginLeft: '0.5rem', alignItems: 'center', color: 'inherit', - backgroundColor: 'var(--vscode-badge-background)', outline: '0.0625rem solid', - outlineColor: 'inherit' - }, - headerBadge: { - height: '1px', - outline: 'none' - }, - firstBadge: { - marginLeft: '0rem' - }, - cardFooterTag: { - marginTop: '0.125rem', - marginLeft: '1.5rem', - marginBottom: '1rem' - }, - text: { - textAlign: 'right' - }, - longDescription: { - overflow: 'hidden', - display: '-webkit-box', - WebkitLineClamp: 3, - WebkitBoxOrient: 'vertical' + outlineColor: '#EE0000' } }); diff --git a/src/webview/git-import/app/cardItem.tsx b/src/webview/git-import/app/cardItem.tsx index 41c49004e..e1e7de361 100644 --- a/src/webview/git-import/app/cardItem.tsx +++ b/src/webview/git-import/app/cardItem.tsx @@ -3,9 +3,9 @@ * Licensed under the MIT License. See LICENSE file in the project root for license information. *-----------------------------------------------------------------------------------------------*/ import React from 'react'; -import StarIcon from '@mui/icons-material/Star'; -import StarBorderIcon from '@mui/icons-material/StarBorder'; -import { Card, makeStyles, Typography } from '@material-ui/core'; +import CheckBoxOutlineBlankOutlinedIcon from '@mui/icons-material/CheckBoxOutlineBlankOutlined'; +import CheckBoxOutlinedIcon from '@mui/icons-material/CheckBoxOutlined'; +import { Badge, Card, makeStyles, Typography } from '@material-ui/core'; import { CompTypeDesc } from './gitImport'; import cardItemStyle from './cardItem.style'; @@ -36,27 +36,39 @@ export const CardItem: React.FC = ({ src={compDesc.devfileData.devfile.metadata.icon} className={style.cardImage} />
- {compDesc.selected ? : } + {compDesc.selected ? : }
{compDesc.devfileData.devfile.metadata.name}
-
+
+
+ { + compDesc.devfileData.devfile.metadata.version && ( + + Version: {compDesc.devfileData.devfile.metadata.version}
+
+ ) + } + + Project Type: {capitalizeFirstLetter(compDesc.devfileData.devfile.metadata.projectType)}
+
+ + Language: {capitalizeFirstLetter(compDesc.devfileData.devfile.metadata.language)}
+
+
{ - compDesc.devfileData.devfile.metadata.version && ( - - Version: {compDesc.devfileData.devfile.metadata.version}
-
- ) + compDesc.registry.name.toLowerCase() !== 'defaultdevfileregistry' && +
+ + {compDesc.registry.name} + +
} - - Project Type: {capitalizeFirstLetter(compDesc.devfileData.devfile.metadata.projectType)}
-
- - Language: {capitalizeFirstLetter(compDesc.devfileData.devfile.metadata.language)}
-
diff --git a/src/webview/git-import/app/gitImport.tsx b/src/webview/git-import/app/gitImport.tsx index 3c19061d3..eefb3b536 100644 --- a/src/webview/git-import/app/gitImport.tsx +++ b/src/webview/git-import/app/gitImport.tsx @@ -278,7 +278,8 @@ export class GitImport extends React.Component { - if (compDesc.devfileData.devfile.metadata.name === compTypeDesc.devfileData.devfile.metadata.name) { + if (compDesc.devfileData.devfile.metadata.name === compTypeDesc.devfileData.devfile.metadata.name + && compDesc.registry.name === compTypeDesc.registry.name) { compTypeDesc.selected = !compTypeDesc.selected; compDesc.selected = compTypeDesc.selected; } else { @@ -341,7 +342,7 @@ export class GitImport extends React.Component {gitURL.helpText !== '' ? - gitURL.helpText === 'Validated' ? + gitURL.helpText.indexOf('valid') !== -1 ? : gitURL.helpText.indexOf('but cannot be reached') !== -1 ? : diff --git a/src/webview/git-import/gitImportLoader.ts b/src/webview/git-import/gitImportLoader.ts index 121dec235..65e380147 100644 --- a/src/webview/git-import/gitImportLoader.ts +++ b/src/webview/git-import/gitImportLoader.ts @@ -46,6 +46,7 @@ export class Command { projectName: event.projectName, applicationName: event.applicationName, compName: event.componentName, + registryName: event.compDesc?.registry.name, devFilePath: !event.devFilePath || event.devFilePath === 'devfile.yaml' || event.devFilePath === 'devfile.yml' ? '' : event.devFilePath }, true);