mirror of
https://github.com/datahub-project/datahub.git
synced 2025-08-30 20:15:56 +00:00
Merge pull request #1240 from theseyi/misc-fix
fixes issue with delete button droppping to new line in smaller resol…
This commit is contained in:
Seyi Adebajo
GitHub
commit
feaaa1a8d6
@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__identifier-column {
|
&__identifier-column {
|
||||||
width: 35%;
|
width: 30%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__identifier-cell {
|
&__identifier-cell {
|
||||||
@ -112,6 +112,7 @@
|
|||||||
&__add-field {
|
&__add-field {
|
||||||
&#{&} {
|
&#{&} {
|
||||||
font-weight: fw(normal, 4);
|
font-weight: fw(normal, 4);
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -210,6 +211,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__tag-item {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
&__tag-info {
|
&__tag-info {
|
||||||
padding: item-spacing(1);
|
padding: item-spacing(1);
|
||||||
margin-bottom: item-spacing(2);
|
margin-bottom: item-spacing(2);
|
||||||
|
|||||||
@ -1,2 +1,3 @@
|
|||||||
@import 'ember-power-select';
|
@import 'ember-power-select';
|
||||||
@import 'ember-radio-button';
|
@import 'ember-radio-button';
|
||||||
|
@import 'ember-tooltip';
|
||||||
|
|||||||
@ -0,0 +1,3 @@
|
|||||||
|
.ember-tooltip {
|
||||||
|
z-index: z(dropdown);
|
||||||
|
}
|
||||||
@ -193,203 +193,204 @@
|
|||||||
{{#if (and isEditing (not row.isReadonly))}}
|
{{#if (and isEditing (not row.isReadonly))}}
|
||||||
{{#each row.fieldChangeSet as |tag|}}
|
{{#each row.fieldChangeSet as |tag|}}
|
||||||
|
|
||||||
{{#basic-dropdown as |tagDrop|}}
|
<div class="dataset-compliance-fields__tag-item">
|
||||||
{{#tagDrop.trigger
|
{{#basic-dropdown as |tagDrop|}}
|
||||||
class="dataset-compliance-fields__tag-info dataset-compliance-fields__tag-info--editable"}}
|
{{#tagDrop.trigger
|
||||||
|
class="dataset-compliance-fields__tag-info dataset-compliance-fields__tag-info--editable"}}
|
||||||
|
|
||||||
<p class="dataset-compliance-fields__tag-info__text">
|
<p class="dataset-compliance-fields__tag-info__text">
|
||||||
{{#if tag.identifierType}}
|
{{#if tag.identifierType}}
|
||||||
{{tag.identifierType}}{{if tag.logicalType (concat " (" tag.logicalType ")")}}
|
{{tag.identifierType}}{{if tag.logicalType (concat " (" tag.logicalType ")")}}
|
||||||
{{else}}
|
{{else}}
|
||||||
<span
|
<span
|
||||||
class="dataset-compliance-fields__tag-info__text dataset-compliance-fields__tag-info__text--obscure">
|
class="dataset-compliance-fields__tag-info__text dataset-compliance-fields__tag-info__text--obscure">
|
||||||
Select Field Type ...
|
Select Field Type ...
|
||||||
</span>
|
</span>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{{/tagDrop.trigger}}
|
{{/tagDrop.trigger}}
|
||||||
|
|
||||||
{{#tagDrop.content overlay=true class="dataset-compliance-fields__guided-modal"}}
|
|
||||||
{{#dataset-compliance-field-tag
|
|
||||||
sourceTag=tag
|
|
||||||
parentHasSingleTag=row.hasSingleTag
|
|
||||||
tagDidChange=(action "tagPropertiesUpdated")
|
|
||||||
complianceFieldIdDropdownOptions=complianceFieldIdDropdownOptions
|
|
||||||
complianceDataTypes=complianceDataTypes as |tagRowComponent|
|
|
||||||
}}
|
|
||||||
<article class="dataset-compliance-fields__field-tag__content">
|
|
||||||
<section class="dataset-compliance-fields__compliance-info-column">
|
|
||||||
<header class="dataset-compliance-fields__compliance-info-column__title">
|
|
||||||
<strong>Select field type</strong>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div class="dataset-compliance-fields__compliance-info-column__content">
|
|
||||||
{{#track-ui-event category=trackableCategory.Compliance
|
|
||||||
action=trackableEvent.Compliance.FieldIndentifier
|
|
||||||
name=tagRowComponent.tag.identifierType as |metrics|}}
|
|
||||||
|
|
||||||
{{#each tagRowComponent.tagIdOptions as |tagOption|}}
|
|
||||||
{{#radio-button-composer
|
|
||||||
value=tagOption.value
|
|
||||||
name="datasetFieldClassification"
|
|
||||||
groupValue=(readonly tagRowComponent.tag.identifierType)
|
|
||||||
class="dataset-compliance-fields__tag-radio"
|
|
||||||
disabled=tagOption.isDisabled
|
|
||||||
disabledClass="dataset-compliance-fields__tag-radio--disabled"
|
|
||||||
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
|
||||||
onMouseEnter=(action tagRowComponent.onFieldTagIdentifierEnter)
|
|
||||||
onMouseLeave=(action tagRowComponent.onFieldTagIdentifierLeave)
|
|
||||||
changed=(action metrics.trackOnAction (action tagRowComponent.tagIdentifierTypeDidChange))}}
|
|
||||||
{{tagOption.label}}
|
|
||||||
{{/radio-button-composer}}
|
|
||||||
{{/each}}
|
|
||||||
|
|
||||||
{{/track-ui-event}}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
{{#if tagRowComponent.quickDesc}}
|
|
||||||
|
|
||||||
|
{{#tagDrop.content overlay=true class="dataset-compliance-fields__guided-modal"}}
|
||||||
|
{{#dataset-compliance-field-tag
|
||||||
|
sourceTag=tag
|
||||||
|
parentHasSingleTag=row.hasSingleTag
|
||||||
|
tagDidChange=(action "tagPropertiesUpdated")
|
||||||
|
complianceFieldIdDropdownOptions=complianceFieldIdDropdownOptions
|
||||||
|
complianceDataTypes=complianceDataTypes as |tagRowComponent|
|
||||||
|
}}
|
||||||
|
<article class="dataset-compliance-fields__field-tag__content">
|
||||||
<section class="dataset-compliance-fields__compliance-info-column">
|
<section class="dataset-compliance-fields__compliance-info-column">
|
||||||
<div class="dataset-compliance-fields__field-tag__quick-desc">
|
<header class="dataset-compliance-fields__compliance-info-column__title">
|
||||||
<strong>
|
<strong>Select field type</strong>
|
||||||
{{tagRowComponent.quickDesc.title}}:
|
</header>
|
||||||
</strong>
|
|
||||||
|
|
||||||
<p>
|
<div class="dataset-compliance-fields__compliance-info-column__content">
|
||||||
{{tagRowComponent.quickDesc.description}}
|
{{#track-ui-event category=trackableCategory.Compliance
|
||||||
</p>
|
action=trackableEvent.Compliance.FieldIndentifier
|
||||||
|
name=tagRowComponent.tag.identifierType as |metrics|}}
|
||||||
|
|
||||||
|
{{#each tagRowComponent.tagIdOptions as |tagOption|}}
|
||||||
|
{{#radio-button-composer
|
||||||
|
value=tagOption.value
|
||||||
|
name="datasetFieldClassification"
|
||||||
|
groupValue=(readonly tagRowComponent.tag.identifierType)
|
||||||
|
class="dataset-compliance-fields__tag-radio"
|
||||||
|
disabled=tagOption.isDisabled
|
||||||
|
disabledClass="dataset-compliance-fields__tag-radio--disabled"
|
||||||
|
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
||||||
|
onMouseEnter=(action tagRowComponent.onFieldTagIdentifierEnter)
|
||||||
|
onMouseLeave=(action tagRowComponent.onFieldTagIdentifierLeave)
|
||||||
|
changed=(action metrics.trackOnAction (action tagRowComponent.tagIdentifierTypeDidChange))}}
|
||||||
|
{{tagOption.label}}
|
||||||
|
{{/radio-button-composer}}
|
||||||
|
{{/each}}
|
||||||
|
|
||||||
|
{{/track-ui-event}}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{{else}}
|
{{#if tagRowComponent.quickDesc}}
|
||||||
|
|
||||||
{{#if tagRowComponent.isIdType}}
|
|
||||||
<section class="dataset-compliance-fields__compliance-info-column">
|
<section class="dataset-compliance-fields__compliance-info-column">
|
||||||
<header class="dataset-compliance-fields__compliance-info-column__title">
|
<div class="dataset-compliance-fields__field-tag__quick-desc">
|
||||||
<strong>Select field format</strong>
|
<strong>
|
||||||
</header>
|
{{tagRowComponent.quickDesc.title}}:
|
||||||
|
</strong>
|
||||||
|
|
||||||
<div class="dataset-compliance-fields__compliance-info-column__content">
|
<p>
|
||||||
{{#track-ui-event category=trackableCategory.Compliance
|
{{tagRowComponent.quickDesc.description}}
|
||||||
action=trackableEvent.Compliance.FieldFormat
|
</p>
|
||||||
name=tagRowComponent.tag.logicalType as |metrics|}}
|
|
||||||
|
|
||||||
{{#each tagRowComponent.fieldFormats as |fieldFormat|}}
|
|
||||||
{{#radio-button-composer
|
|
||||||
value=fieldFormat.value
|
|
||||||
name="datasetFieldFieldFormat"
|
|
||||||
groupValue=(readonly tagRowComponent.tag.logicalType)
|
|
||||||
class="dataset-compliance-fields__tag-radio"
|
|
||||||
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
|
||||||
changed=(action metrics.trackOnAction (action tagRowComponent.tagLogicalTypeDidChange))}}
|
|
||||||
{{fieldFormat.label}}
|
|
||||||
{{/radio-button-composer}}
|
|
||||||
{{/each}}
|
|
||||||
|
|
||||||
{{/track-ui-event}}
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{{#if tagRowComponent.showCustomInput}}
|
{{else}}
|
||||||
|
|
||||||
|
{{#if tagRowComponent.isIdType}}
|
||||||
<section class="dataset-compliance-fields__compliance-info-column">
|
<section class="dataset-compliance-fields__compliance-info-column">
|
||||||
<header class="dataset-compliance-fields__compliance-info-column__title">
|
<header class="dataset-compliance-fields__compliance-info-column__title">
|
||||||
<strong>Custom RegEx</strong>
|
<strong>Select field format</strong>
|
||||||
</header>
|
|
||||||
|
|
||||||
<div
|
|
||||||
class="dataset-compliance-fields__compliance-info-column__content">
|
|
||||||
|
|
||||||
<div class="dataset-compliance-fields__text-pattern-wrap">
|
|
||||||
<div class="dataset-compliance-fields__text-pattern-wrap--input">
|
|
||||||
<input
|
|
||||||
placeholder="Enter a RegExp"
|
|
||||||
value="{{readonly tagRowComponent.tag.valuePattern}}"
|
|
||||||
disabled={{or (not isEditing) row.isReadonly}}
|
|
||||||
class="dataset-compliance-fields__text-pattern {{if
|
|
||||||
tagRowComponent.valuePatternError
|
|
||||||
'dataset-compliance-fields--missing-selection'}}"
|
|
||||||
oninput={{action tagRowComponent.tagValuePatternDidChange
|
|
||||||
value="target.value"}}
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{more-info
|
|
||||||
link="http://go/metadata-custom-regex"
|
|
||||||
tooltip="Click for more information on RegExp format"
|
|
||||||
}}
|
|
||||||
|
|
||||||
{{#if tagRowComponent.valuePatternError}}
|
|
||||||
<div class="dataset-compliance-fields__text-pattern-wrap--error">
|
|
||||||
{{tagRowComponent.valuePatternError}}
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{#unless tagRowComponent.isTagFormatMissing}}
|
|
||||||
<section class="dataset-compliance-fields__compliance-info-column">
|
|
||||||
<header class="dataset-compliance-fields__compliance-info-column__title">
|
|
||||||
<strong>Is purge key?</strong>
|
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div class="dataset-compliance-fields__compliance-info-column__content">
|
<div class="dataset-compliance-fields__compliance-info-column__content">
|
||||||
|
{{#track-ui-event category=trackableCategory.Compliance
|
||||||
|
action=trackableEvent.Compliance.FieldFormat
|
||||||
|
name=tagRowComponent.tag.logicalType as |metrics|}}
|
||||||
|
|
||||||
{{#radio-button-composer
|
{{#each tagRowComponent.fieldFormats as |fieldFormat|}}
|
||||||
value=false
|
{{#radio-button-composer
|
||||||
name="datasetFieldOwnerToggle"
|
value=fieldFormat.value
|
||||||
groupValue=(readonly tagRowComponent.tag.nonOwner)
|
name="datasetFieldFieldFormat"
|
||||||
class="dataset-compliance-fields__tag-radio"
|
groupValue=(readonly tagRowComponent.tag.logicalType)
|
||||||
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
class="dataset-compliance-fields__tag-radio"
|
||||||
changed=(action tagRowComponent.tagOwnerDidChange)}}
|
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
||||||
Yes
|
changed=(action metrics.trackOnAction (action tagRowComponent.tagLogicalTypeDidChange))}}
|
||||||
{{/radio-button-composer}}
|
{{fieldFormat.label}}
|
||||||
|
{{/radio-button-composer}}
|
||||||
|
{{/each}}
|
||||||
|
|
||||||
{{#radio-button-composer
|
{{/track-ui-event}}
|
||||||
value=true
|
|
||||||
name="datasetFieldOwnerToggle"
|
|
||||||
groupValue=(readonly tagRowComponent.tag.nonOwner)
|
|
||||||
class="dataset-compliance-fields__tag-radio"
|
|
||||||
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
|
||||||
changed=(action tagRowComponent.tagOwnerDidChange)}}
|
|
||||||
No
|
|
||||||
{{/radio-button-composer}}
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
{{/unless}}
|
|
||||||
|
{{#if tagRowComponent.showCustomInput}}
|
||||||
|
<section class="dataset-compliance-fields__compliance-info-column">
|
||||||
|
<header class="dataset-compliance-fields__compliance-info-column__title">
|
||||||
|
<strong>Custom RegEx</strong>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="dataset-compliance-fields__compliance-info-column__content">
|
||||||
|
|
||||||
|
<div class="dataset-compliance-fields__text-pattern-wrap">
|
||||||
|
<div class="dataset-compliance-fields__text-pattern-wrap--input">
|
||||||
|
<input
|
||||||
|
placeholder="Enter a RegExp"
|
||||||
|
value="{{readonly tagRowComponent.tag.valuePattern}}"
|
||||||
|
disabled={{or (not isEditing) row.isReadonly}}
|
||||||
|
class="dataset-compliance-fields__text-pattern {{if
|
||||||
|
tagRowComponent.valuePatternError
|
||||||
|
'dataset-compliance-fields--missing-selection'}}"
|
||||||
|
oninput={{action tagRowComponent.tagValuePatternDidChange
|
||||||
|
value="target.value"}}
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{more-info
|
||||||
|
link="http://go/metadata-custom-regex"
|
||||||
|
tooltip="Click for more information on RegExp format"
|
||||||
|
}}
|
||||||
|
|
||||||
|
{{#if tagRowComponent.valuePatternError}}
|
||||||
|
<div class="dataset-compliance-fields__text-pattern-wrap--error">
|
||||||
|
{{tagRowComponent.valuePatternError}}
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
|
{{#unless tagRowComponent.isTagFormatMissing}}
|
||||||
|
<section class="dataset-compliance-fields__compliance-info-column">
|
||||||
|
<header class="dataset-compliance-fields__compliance-info-column__title">
|
||||||
|
<strong>Is purge key?</strong>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="dataset-compliance-fields__compliance-info-column__content">
|
||||||
|
|
||||||
|
{{#radio-button-composer
|
||||||
|
value=false
|
||||||
|
name="datasetFieldOwnerToggle"
|
||||||
|
groupValue=(readonly tagRowComponent.tag.nonOwner)
|
||||||
|
class="dataset-compliance-fields__tag-radio"
|
||||||
|
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
||||||
|
changed=(action tagRowComponent.tagOwnerDidChange)}}
|
||||||
|
Yes
|
||||||
|
{{/radio-button-composer}}
|
||||||
|
|
||||||
|
{{#radio-button-composer
|
||||||
|
value=true
|
||||||
|
name="datasetFieldOwnerToggle"
|
||||||
|
groupValue=(readonly tagRowComponent.tag.nonOwner)
|
||||||
|
class="dataset-compliance-fields__tag-radio"
|
||||||
|
checkedClass="dataset-compliance-fields__tag-radio--checked"
|
||||||
|
changed=(action tagRowComponent.tagOwnerDidChange)}}
|
||||||
|
No
|
||||||
|
{{/radio-button-composer}}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
{{/unless}}
|
||||||
|
{{/if}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}}
|
</article>
|
||||||
</article>
|
|
||||||
|
|
||||||
<footer class="dataset-compliance-fields__field-tag__footer">
|
<footer class="dataset-compliance-fields__field-tag__footer">
|
||||||
{{#if tagRowComponent.localTagHasDiverged}}
|
{{#if tagRowComponent.localTagHasDiverged}}
|
||||||
<button
|
<button
|
||||||
class="nacho-button nacho-button--large-inverse"
|
class="nacho-button nacho-button--large-inverse"
|
||||||
onclick={{action tagRowComponent.onFieldTagUpdate tagDrop.actions.close}}
|
onclick={{action tagRowComponent.onFieldTagUpdate tagDrop.actions.close}}
|
||||||
disabled={{tagRowComponent.isTagReviewRequired}}>
|
disabled={{tagRowComponent.isTagReviewRequired}}>
|
||||||
Done
|
Done
|
||||||
</button>
|
</button>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</footer>
|
</footer>
|
||||||
{{/dataset-compliance-field-tag}}
|
{{/dataset-compliance-field-tag}}
|
||||||
{{/tagDrop.content}}
|
{{/tagDrop.content}}
|
||||||
{{/basic-dropdown}}
|
{{/basic-dropdown}}
|
||||||
|
|
||||||
{{#if (and isEditing (not row.hasSingleTag))}}
|
{{#if (and isEditing (not row.hasSingleTag))}}
|
||||||
<span class="nacho-tooltip" title="Delete Tag">
|
<span class="nacho-tooltip" title="Delete Tag">
|
||||||
<button class="nacho-button nacho-button--tertiary dataset-compliance-fields__remove-tag"
|
<button class="nacho-button nacho-button--tertiary dataset-compliance-fields__remove-tag"
|
||||||
onclick={{action row.onRemoveFieldTag tag}}>
|
onclick={{action row.onRemoveFieldTag tag}}>
|
||||||
{{fa-icon "trash"}}
|
{{fa-icon "trash"}}
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
</div>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
|
|
||||||
{{#unless row.hasNoneTag}}
|
{{#unless row.hasNoneTag}}
|
||||||
<br>
|
|
||||||
<button
|
<button
|
||||||
class="nacho-button nacho-button--tertiary dataset-compliance-fields__add-field"
|
class="nacho-button nacho-button--tertiary dataset-compliance-fields__add-field"
|
||||||
onclick={{action row.onAddFieldTag}}>
|
onclick={{action row.onAddFieldTag}}>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user