Skip to content

Commit 4e19a28

Browse files
add icon for multiple collections to FormData
1 parent dae3d32 commit 4e19a28

2 files changed

Lines changed: 24 additions & 15 deletions

File tree

client/src/components/Form/Elements/FormData/FormDataContextButtons.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<script setup lang="ts">
2+
import { faFolder } from "@fortawesome/free-regular-svg-icons";
23
import { faCaretDown, faEye, faPlus, faSpinner, faUpload } from "@fortawesome/free-solid-svg-icons";
34
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
45
import { BButton, BButtonGroup, BDropdown, BDropdownItem } from "bootstrap-vue";
@@ -59,8 +60,13 @@ function createCollectionType(colType: string) {
5960
v-b-tooltip.hover.bottom
6061
:pressed="props.currentField === index"
6162
:title="v.tooltip"
63+
:style="v.icon === faFolder && v.multiple ? 'padding-bottom: 2px' : ''"
6264
@click="emit('set-current-field', index)">
63-
<FontAwesomeIcon :icon="['far', v.icon]" />
65+
<span v-if="v.icon === faFolder && v.multiple" style="position: relative; display: inline-block">
66+
<FontAwesomeIcon :icon="faFolder" size="sm" style="position: absolute; left: 2px" />
67+
<FontAwesomeIcon :icon="faFolder" size="sm" />
68+
</span>
69+
<FontAwesomeIcon v-else :icon="v.icon" />
6470
</BButton>
6571
<BButton
6672
v-if="props.canBrowse && !props.workflowRun"

client/src/components/Form/Elements/FormData/variants.ts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
import { faCopy, faFile, faFolder } from "@fortawesome/free-regular-svg-icons";
2+
import type { IconDefinition } from "font-awesome-6";
3+
14
/** Data input variations interface */
25
export interface VariantInterface {
36
batch: string;
4-
icon: string;
7+
icon: IconDefinition;
58
library?: boolean;
69
multiple: boolean;
710
src: string;
@@ -19,22 +22,22 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
1922
data: [
2023
{
2124
src: SOURCE.DATASET,
22-
icon: "fa-file",
25+
icon: faFile,
2326
tooltip: "Single dataset",
2427
library: true,
2528
multiple: false,
2629
batch: BATCH.DISABLED,
2730
},
2831
{
2932
src: SOURCE.DATASET,
30-
icon: "fa-copy",
33+
icon: faCopy,
3134
tooltip: "Multiple datasets",
3235
multiple: true,
3336
batch: BATCH.LINKED,
3437
},
3538
{
3639
src: SOURCE.COLLECTION,
37-
icon: "fa-folder",
40+
icon: faFolder,
3841
tooltip: "Dataset collection",
3942
multiple: false,
4043
batch: BATCH.LINKED,
@@ -43,15 +46,15 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
4346
data_multiple: [
4447
{
4548
src: SOURCE.DATASET,
46-
icon: "fa-copy",
49+
icon: faCopy,
4750
tooltip: "Multiple datasets",
4851
library: true,
4952
multiple: true,
5053
batch: BATCH.DISABLED,
5154
},
5255
{
5356
src: SOURCE.COLLECTION,
54-
icon: "fa-folder",
57+
icon: faFolder,
5558
tooltip: "Dataset collection",
5659
multiple: true,
5760
batch: BATCH.DISABLED,
@@ -60,7 +63,7 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
6063
data_collection: [
6164
{
6265
src: SOURCE.COLLECTION,
63-
icon: "fa-folder",
66+
icon: faFolder,
6467
tooltip: "Dataset collection",
6568
multiple: false,
6669
batch: BATCH.DISABLED,
@@ -69,7 +72,7 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
6972
workflow_data: [
7073
{
7174
src: SOURCE.DATASET,
72-
icon: "fa-file",
75+
icon: faFile,
7376
tooltip: "Single dataset",
7477
multiple: false,
7578
batch: BATCH.DISABLED,
@@ -78,7 +81,7 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
7881
workflow_data_multiple: [
7982
{
8083
src: SOURCE.DATASET,
81-
icon: "fa-copy",
84+
icon: faCopy,
8285
tooltip: "Multiple datasets",
8386
multiple: true,
8487
batch: BATCH.DISABLED,
@@ -87,7 +90,7 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
8790
workflow_data_collection: [
8891
{
8992
src: SOURCE.COLLECTION,
90-
icon: "fa-folder",
93+
icon: faFolder,
9194
tooltip: "Dataset collection",
9295
multiple: false,
9396
batch: BATCH.DISABLED,
@@ -96,14 +99,14 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
9699
module_data: [
97100
{
98101
src: SOURCE.DATASET,
99-
icon: "fa-file",
102+
icon: faFile,
100103
tooltip: "Single dataset",
101104
multiple: false,
102105
batch: BATCH.DISABLED,
103106
},
104107
{
105108
src: SOURCE.DATASET,
106-
icon: "fa-copy",
109+
icon: faCopy,
107110
tooltip: "Multiple datasets",
108111
multiple: true,
109112
batch: BATCH.ENABLED,
@@ -112,14 +115,14 @@ export const VARIANTS: Record<string, Array<VariantInterface>> = {
112115
module_data_collection: [
113116
{
114117
src: SOURCE.COLLECTION,
115-
icon: "fa-folder",
118+
icon: faFolder,
116119
tooltip: "Dataset collection",
117120
multiple: false,
118121
batch: BATCH.DISABLED,
119122
},
120123
{
121124
src: SOURCE.COLLECTION,
122-
icon: "fa-folder",
125+
icon: faFolder,
123126
tooltip: "Multiple collections",
124127
multiple: true,
125128
batch: BATCH.ENABLED,

0 commit comments

Comments
 (0)