Skip to content

Commit

Permalink
Merge pull request #16017 from martenson/grids-ref-minor
Browse files Browse the repository at this point in the history
minor tooltip and UI client changes
  • Loading branch information
davelopez authored May 2, 2023
2 parents 9c7f7a7 + 4e770c5 commit 5d26ff3
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 8 deletions.
8 changes: 6 additions & 2 deletions client/src/components/Common/DelayedInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<b-input-group-append>
<b-button
v-if="enableAdvanced"
v-b-tooltip.hover
aria-haspopup="true"
size="sm"
:pressed="showAdvanced"
:variant="showAdvanced ? 'info' : 'secondary'"
Expand All @@ -23,6 +25,8 @@
<icon v-else icon="angle-double-down" />
</b-button>
<b-button
v-b-tooltip.hover
aria-haspopup="true"
class="search-clear"
size="sm"
:title="titleClear | l"
Expand Down Expand Up @@ -67,8 +71,8 @@ export default {
queryInput: null,
queryTimer: null,
queryCurrent: null,
titleClear: "clear search (esc)",
titleAdvanced: "toggle advanced search",
titleClear: "Clear Search (esc)",
titleAdvanced: "Toggle Advanced Search",
};
},
watch: {
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/DatasetInformation/DatasetSource.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { library } from "@fortawesome/fontawesome-svg-core";
import { faCopy, faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
import { copy } from "utils/clipboard";
import DatasetSourceTransform from "./DatasetSourceTransform";
import _l from "utils/localization";
library.add(faCopy, faExternalLinkAlt);
Expand All @@ -46,7 +47,7 @@ export default {
},
methods: {
copyLink() {
copy(this.sourceUri, "Link copied to the clipboard.");
copy(this.sourceUri, _l("Link copied to your clipboard"));
},
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default {
},
methods: {
onCopyLink() {
const msg = this.localize("Link is copied to your clipboard");
const msg = this.localize("Link copied to your clipboard");
sendToClipboard(absPath(this.downloadUrl), msg);
},
onDownload(resource) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,23 @@
</DebouncedInput>
<b-input-group-append>
<b-button
v-b-tooltip.hover
aria-haspopup="true"
size="sm"
:pressed="showAdvanced"
:variant="showAdvanced ? 'info' : 'secondary'"
data-description="show advanced filter toggle"
title="Show Advanced Filter"
aria-label="Show advanced filter"
@click="onToggle">
<icon v-if="showAdvanced" icon="angle-double-up" />
<icon v-else icon="angle-double-down" />
</b-button>
<b-button
v-b-tooltip.hover
aria-haspopup="true"
size="sm"
title="Clear Filters (esc)"
aria-label="Clear filters"
data-description="clear filters"
@click="updateFilter('')">
Expand Down
13 changes: 11 additions & 2 deletions client/src/components/Indices/IndexFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,28 @@
autocomplete="off"
:placeholder="placeholder | localize"
data-description="filter index input"
class="search-query"
class="search-query index-filter-query"
:size="size"
@input="input"
@keyup.esc="onReset" />
</DebouncedInput>
<b-input-group-append>
<b-button
data-description="show deleted filter toggle"
v-b-tooltip.hover
aria-haspopup="true"
title="Advanced Filtering Help"
:size="size"
@click="onHelp">
<icon icon="question" />
</b-button>
<b-button
v-b-tooltip.hover
aria-haspopup="true"
title="Clear Filters (esc)"
:size="size"
@click="onReset">
<icon icon="times" />
</b-button>
</b-input-group-append>
</b-input-group>
<b-modal v-model="showHelp" title="Filtering Options Help" ok-only>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { computed, ref, onMounted } from "vue";
import { withPrefix } from "@/utils/redirect";
import LoadingSpan from "@/components/LoadingSpan.vue";
import WorkflowTree from "./WorkflowTree.vue";
import { isEmpty } from "@/utils/utils";
interface WorkflowDisplayProps {
workflowId: string;
Expand Down Expand Up @@ -69,7 +70,7 @@ onMounted(async () => {
type="button"
class="py-0 px-1"
data-description="workflow import">
<span class="fa fa-file-import" />
<span class="fa fa-upload" />
</b-button>
</span>
<span>
Expand All @@ -80,7 +81,7 @@ onMounted(async () => {
<b-card-body>
<LoadingSpan v-if="loading" message="Loading Workflow" />
<div v-else :class="!expanded && 'content-height'">
<b-alert v-if="errorContent !== null" variant="danger" show>
<b-alert v-if="!isEmpty(errorContent)" variant="danger" show>
<b>Please fix the following error(s):</b>
<ul v-if="typeof errorContent === 'object'" class="my-2">
<li v-for="(errorValue, errorKey) in errorContent" :key="errorKey">
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/Panels/ToolBoxWorkflow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
</div>
<div class="unified-panel-controls">
<tool-search
v-b-tooltip.hover
aria-haspopup="true"
:current-panel-view="currentPanelView"
placeholder="search tools"
:toolbox="workflowTools"
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/plugins/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
faEllipsisH,
faEllipsisV,
faExchangeAlt,
faExternalLinkAlt,
faEye,
faFileArchive,
faFileExport,
Expand Down Expand Up @@ -62,6 +63,7 @@ library.add(
faEllipsisH,
faEllipsisV,
faExchangeAlt,
faExternalLinkAlt,
faEye,
faFileArchive,
faFileExport,
Expand Down

0 comments on commit 5d26ff3

Please sign in to comment.