This commit is contained in:
Gerard Burns 2024-04-04 16:24:24 +01:00
parent 3443fe0c6e
commit c011ff1598
3 changed files with 65 additions and 26 deletions

View File

@ -45,31 +45,55 @@
<div class="chip columnName"> <div class="chip columnName">
{columnName} {columnName}
</div> </div>
<span> is a </span> <span class="text"> is a </span>
<a target=”_blank” href={docLink} class="chip link topLink"> <a target=”_blank” href={docLink} class="chip link topLink">
<Icon size="S" name={columnIcon} /> <Icon size="S" name={columnIcon} />
<span>{columnType} Column</span> <span class="text">{columnType} column</span>
</a> </a>
<span class="period">.</span>
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div class={`line ${supportLevelClass}`}> <div class={`line ${supportLevelClass}`}>
<span class="bullet"></span>
<div class={`chip supportChip ${supportLevelClass}`}> <div class={`chip supportChip ${supportLevelClass}`}>
<Icon size="S" tooltip={supportLevelIconTooltip} name={supportLevelIcon} /> <Icon size="S" tooltip={supportLevelIconTooltip} name={supportLevelIcon} />
<span>{supportLevelText}</span> <span class="text">{supportLevelText}</span>
</div> </div>
<span>with</span> <span class="text">with</span>
<div class="chip link"> <div class="chip link">
<Icon size="S" name={"GraphPie"} /> <Icon size="S" name={"GraphPie"} />
<span>Chart Components</span> <span class="text">Chart components</span>
</div> </div>
</div> </div>
{#if warnings.includes("string number warning")} {#if warnings.includes("string number warning")}
<div class={`line ${supportLevelClass}`}> <div class={`line`}>
<span> <span class="bullet"></span>
Non-numeric values will not be displayed <div class="chip link">
</span> <Icon size="S" name={"123"} />
</div> <span class="text">
{/if} Non-numeric values
</span>
</div>
<span class="text">
will not be displayed
</span>
</div>
{/if}
{#if warnings.includes("optional warning")}
<div class={`line`}>
<span class="bullet"></span>
<span class="text">No</span>
<div class="chip link">
<Icon size="S" name={"DataUnavailable"} />
<span class="text">
Required constraint
</span>
</div>
<span class="text">
so rows may be missing values
</span>
</div>
{/if}
<!-- <!--
{#if errors.length > 0} {#if errors.length > 0}
@ -93,11 +117,17 @@
border-radius: 5px; border-radius: 5px;
vertical-align: sub; vertical-align: sub;
margin-right: 5px; margin-right: 5px;
filter: brightness(90%);
}
.chip:hover {
filter: brightness(110%);
transition: filter 300ms
} }
.columnName { .columnName {
font-style: italic; font-style: italic;
background-color: var(--grey-2); background-color: var(--grey-3);
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -107,13 +137,20 @@
margin-right: 0; margin-right: 0;
} }
.bullet {
color: var(--grey-5);
font-size: 17px;
display: inline block;
margin-right: 10px;
}
.topLink { .topLink {
flex-shrink: 0; flex-shrink: 0;
} }
.divider { .divider {
border-bottom: 1px solid var(--grey-4); border-bottom: 1px solid var(--grey-4);
margin: 6px 0 16px; margin: 12px 0 12px;
} }
.tooltipContents { .tooltipContents {
@ -130,7 +167,7 @@
align-items: center; align-items: center;
} }
.topLine > span { .topLine > .text{
flex-shrink: 0; flex-shrink: 0;
margin: 0 5px; margin: 0 5px;
} }
@ -139,22 +176,24 @@
background-color: var(--background-alt); background-color: var(--background-alt);
color: var(--ink); color: var(--ink);
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 12px;
} }
.line > span { .line:last-child {
margin-bottom: 0px;
}
.line > .text {
display: inline; display: inline;
margin-right: 5px; margin-right: 5px;
} }
.link { .link {
background-color: var(--spectrum-global-color-blue-500); background-color: var(--bb-indigo);
color: white; color: white;
transition: background-color 300ms
} }
.link:hover { .link:hover {
background-color: var(--spectrum-global-color-blue-700);
cursor: pointer; cursor: pointer;
} }
@ -171,14 +210,14 @@
} }
.supportChip.supportLevelUnsupported { .supportChip.supportLevelUnsupported {
background-color: var(--red) background-color: var(--red);
} }
.supportChip.supportLevelPartialSupport { .supportChip.supportLevelPartialSupport {
background-color: var(--yellow) background-color: var(--yellow);
} }
.supportChip.supportLevelSupported { .supportChip.supportLevelSupported {
background-color: var(--green) background-color: var(--green);
} }
</style> </style>

View File

@ -128,7 +128,7 @@
class: "supportLevelUnsupported", class: "supportLevelUnsupported",
icon: "Alert", icon: "Alert",
iconTooltip: fieldSupport[optionKey]?.message, iconTooltip: fieldSupport[optionKey]?.message,
text: "Not Compatible" text: "Not compatible"
} }
} }
@ -137,7 +137,7 @@
class: "supportLevelPartialSupport", class: "supportLevelPartialSupport",
icon: "AlertCheck", icon: "AlertCheck",
iconTooltip: fieldSupport[optionKey]?.message, iconTooltip: fieldSupport[optionKey]?.message,
text: "Partially Compatible" text: "Partially compatible"
} }
} }

View File

@ -39,7 +39,7 @@ export const validators = {
const isRequired = fieldSchema?.constraints?.presence?.allowEmpty === false const isRequired = fieldSchema?.constraints?.presence?.allowEmpty === false
if (!isRequired) { if (!isRequired) {
response.warnings.push( response.warnings.push(
"This column is optional, and some rows may not have a value.") "optional warning")
} }
if (response.errors.length > 0) { if (response.errors.length > 0) {