Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Component wrapper - tab - part 3 #54

Open
wants to merge 49 commits into
base: component-wrappers
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
4da2e13
Add g-input wrapper for b-input
dannon Jul 12, 2023
a77420b
Add g-input wrapper for b-input
dannon Jul 12, 2023
3a8d3a4
Add GAlert wrapper for BAlert
itisAliRH Jul 14, 2023
85a7618
Add GLink wrapper for BLink
itisAliRH Jul 14, 2023
3dce2f1
Change all `b-form-input`s to `GInput`s
ahmedhamidawan Jul 14, 2023
b61901a
Change all `b-form-input`s to `GInput`s
ahmedhamidawan Jul 14, 2023
5d2fb72
Add GInputGroup, GInputGroupAppend, GInputGroupPrepend and GInputGrou…
itisAliRH Jul 14, 2023
871d845
add `<slot>` to G component wrappers
ahmedhamidawan Jul 15, 2023
ee59748
fix GAlert default colour
itisAliRH Jul 15, 2023
a563717
Add GCol wrapper for BCol
itisAliRH Jul 15, 2023
1465c37
fix slots for GCol, GInputGroupPrepend and GInputGroupText
itisAliRH Jul 15, 2023
0e60036
Add GRow wrapper for BRow
itisAliRH Jul 15, 2023
aa293d9
Add GCardTitle wrapper for BCardTitle
itisAliRH Jul 15, 2023
e35f6e0
Add GCardText wrapper for BCardText
itisAliRH Jul 15, 2023
5c20202
Initial commit; new component file
hujambo-dunia Jul 15, 2023
0a5bdf3
Add GCardBody wrapper for BCardBody
itisAliRH Jul 15, 2023
0bf7b63
Updated references to new component
hujambo-dunia Jul 15, 2023
f8bd74e
Add GCardFooter wrapper for BCardFooter
itisAliRH Jul 15, 2023
4b28279
Add GCardHeader wrapper for BCardHeader
itisAliRH Jul 15, 2023
cc9ebc9
Initial commit; new component file
hujambo-dunia Jul 15, 2023
e3884ec
Add GCardGroup wrapper for BCardGroup
itisAliRH Jul 15, 2023
ba83acc
Add GCardImg wrapper for BCardImg
itisAliRH Jul 15, 2023
12f171f
Updated references to new component
hujambo-dunia Jul 15, 2023
a35dfce
Merge pull request #50 from hujambo-dunia/component-wrapper-tooltip
dannon Jul 15, 2023
96ca79c
Merge branch 'component-wrappers' into component-wrapper-tab
dannon Jul 15, 2023
bb7872e
Merge pull request #51 from hujambo-dunia/component-wrapper-tab
dannon Jul 15, 2023
69a71b8
Add GCard wrapper for BCard
itisAliRH Jul 15, 2023
3dbddb3
Add GProgressBar wrapper for BProgressBar
itisAliRH Jul 15, 2023
acad193
Add GCollapse wrapper for BCollapse
itisAliRH Jul 15, 2023
de283e5
fix slot for GCollapse
itisAliRH Jul 15, 2023
5480216
Add GPagination wrapper for BPagination
itisAliRH Jul 15, 2023
0d2dc3b
Add GContainer wrapper for BContainer
itisAliRH Jul 15, 2023
634b407
Add GBreadcrumbItem wrapper for BBreadcrumbItem
itisAliRH Jul 15, 2023
68e64f8
Add GBreadcrumb wrapper for BBreadcrumb
itisAliRH Jul 15, 2023
f0d475f
Add GBadge wrapper for BBadge
itisAliRH Jul 15, 2023
f203bd7
Add GDropdownText wrapper for BDropdownText
itisAliRH Jul 15, 2023
37d3dfc
Add GDropdownItem wrapper for BDropdownItem
itisAliRH Jul 15, 2023
e6a176d
Add GDropdownDivider wrapper for BDropdownDivider
itisAliRH Jul 15, 2023
ebd7934
Add GDropdownGroup wrapper for BDropdownGroup
itisAliRH Jul 15, 2023
9c14bd5
Add GDropdownForm wrapper for BDropdownForm
itisAliRH Jul 15, 2023
ea51477
Add GDropdown wrapper for BDropdown
itisAliRH Jul 15, 2023
fa02a19
Add GEmbed wrapper for BEmbed
itisAliRH Jul 15, 2023
b8fe262
Add GImg wrapper for BImg
itisAliRH Jul 15, 2023
98e8841
Add GNavItemDropdown wrapper for BNavItemDropdown
itisAliRH Jul 15, 2023
8f6d349
Add GNavItem wrapper for BNavItem
itisAliRH Jul 15, 2023
b2ea0b1
Add GNavbarNav wrapper for BNavbarNav
itisAliRH Jul 15, 2023
5f4d576
Fixed missing import calls; deprecated import calls to Bootstrap-vue
hujambo-dunia Jul 15, 2023
4f97efc
Fixed missing import calls; deprecated import calls to Bootstrap-vue
hujambo-dunia Jul 15, 2023
06563e3
Eslint
hujambo-dunia Jul 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add GLink wrapper for BLink
  • Loading branch information
itisAliRH committed Jul 14, 2023
commit 85a761866ea1101aa09ece2a53d0da476d79ea24
7 changes: 7 additions & 0 deletions client/src/component-library/GLink.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script setup lang="ts">
import { BLink } from "bootstrap-vue";
</script>

<template>
<BLink v-bind="$attrs" v-on="$listeners"> </BLink>
</template>
8 changes: 5 additions & 3 deletions client/src/components/Common/ExportRecordTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import {
faSpinner,
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
import { BButton, BButtonGroup, BButtonToolbar, BCard, BCollapse, BLink, BTable } from "bootstrap-vue";
import { BButton, BButtonGroup, BButtonToolbar, BCard, BCollapse, BTable } from "bootstrap-vue";
import { computed, ref } from "vue";

import GLink from "@/component-library/GLink.vue";

library.add(faExclamationCircle, faCheckCircle, faDownload, faFileImport, faSpinner, faLink);

const props = defineProps({
Expand Down Expand Up @@ -50,13 +52,13 @@ function copyDownloadLink(record) {

<template>
<div>
<b-link
<GLink
:class="isExpanded ? null : 'collapsed'"
:aria-expanded="isExpanded ? 'true' : 'false'"
aria-controls="collapse-previous"
@click="isExpanded = !isExpanded">
{{ title }}
</b-link>
</GLink>
<b-collapse id="collapse-previous" v-model="isExpanded">
<b-card>
<b-table :items="props.records" :fields="fields">
Expand Down
9 changes: 7 additions & 2 deletions client/src/components/Dataset/DatasetName.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<b-link
<GLink
id="dataset-dropdown"
class="workflow-dropdown font-weight-bold p-2"
data-toggle="dropdown"
Expand All @@ -18,7 +18,7 @@
title="The creation of this dataset has been paused." />
<span v-else class="dataset-icon fa fa-caret-down" />
<span class="name">{{ getName }}</span>
</b-link>
</GLink>
<div class="dropdown-menu" aria-labelledby="dataset-dropdown">
<a class="dropdown-item" href="#" @click.prevent="showDataset">
<span class="fa fa-eye fa-fw mr-1" />
Expand All @@ -35,9 +35,14 @@
import BootstrapVue from "bootstrap-vue";
import Vue from "vue";

import GLink from "@/component-library/GLink.vue";

Vue.use(BootstrapVue);

export default {
components: {
GLink,
},
props: {
item: Object,
},
Expand Down
11 changes: 6 additions & 5 deletions client/src/components/History/Content/Dataset/DatasetDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</span>
<span v-if="result.genome_build" class="dbkey">
<label v-localize class="prompt">database</label>
<b-link class="value" data-label="Database/Build" @click.stop="$emit('edit')">{{
result.genome_build
}}</b-link>
<GLink class="value" data-label="Database/Build" @click.stop="$emit('edit')">
{{ result.genome_build }}
</GLink>
</span>
<div v-if="result.misc_info" class="info">
<span class="value">{{ result.misc_info }}</span>
Expand Down Expand Up @@ -85,17 +85,18 @@
</template>

<script>
import { BLink } from "bootstrap-vue";
import { STATES } from "components/History/Content/model/states";
import { DatasetProvider } from "components/providers/storeProviders";

import DatasetActions from "./DatasetActions";

import GLink from "@/component-library/GLink.vue";

export default {
components: {
GLink,
DatasetActions,
DatasetProvider,
BLink,
},
props: {
dataset: { type: Object, required: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,23 @@
<b>Please notice your selection has changed.</b> Manually unselecting items or adding new ones will disable the
`select all` status.
<b-progress variant="info" :max="dismissSecs" :value="dismissCountDown" height="4px" />
<b-link @click="onDoNotShowAgain">Do not show again</b-link>
<GLink @click="onDoNotShowAgain">Do not show again</GLink>
</GAlert>
</template>

<script>
import { BLink, BProgress } from "bootstrap-vue";
import { BProgress } from "bootstrap-vue";
import { mapActions, mapState } from "pinia";

import { useUserFlagsStore } from "@/stores/userFlagsStore";

import GAlert from "@/component-library/GAlert.vue";
import GLink from "@/component-library/GLink.vue";

export default {
components: {
GAlert,
BLink,
GLink,
BProgress,
},
props: {
Expand Down
8 changes: 5 additions & 3 deletions client/src/components/History/Export/ExportOptions.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<script setup>
import { BCard, BCollapse, BFormCheckbox, BFormGroup, BFormSelect, BLink } from "bootstrap-vue";
import { BCard, BCollapse, BFormCheckbox, BFormGroup, BFormSelect } from "bootstrap-vue";
import { ExportParamsModel } from "components/Common/models/exportRecordModel";
import { computed, reactive, ref } from "vue";

import { AVAILABLE_EXPORT_FORMATS } from "./services";

import GLink from "@/component-library/GLink.vue";

const props = defineProps({
exportParams: {
type: ExportParamsModel,
Expand All @@ -30,14 +32,14 @@ function onValueChanged() {

<template>
<div>
<b-link
<GLink
id="toggle-options-link"
:class="isExpanded ? null : 'collapsed'"
:aria-expanded="isExpanded ? 'true' : 'false'"
aria-controls="collapse-options"
@click="isExpanded = !isExpanded">
{{ title }}
</b-link>
</GLink>
<b-collapse id="collapse-options" v-model="isExpanded">
<b-card>
<b-form-group label="Export Format:" label-for="format">
Expand Down
10 changes: 8 additions & 2 deletions client/src/components/HistoryExport/ExportLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</span>
<i
title="Information about when the history export was generated is included in the job details. Additionally, if there are issues with export, the job details may help figure out the underlying problem or communicate issues to your Galaxy administrator.">
(<b-link class="show-job-link" href="#" @click="showDetails">view job details</b-link>)
(<GLink class="show-job-link" href="#" @click="showDetails">view job details</GLink>)
</i>
<b-modal v-model="details" modal-class="job-information-modal" scrollable ok-only hide-header>
<job-information :job_id="historyExport.job_id" :include-times="true" />
Expand All @@ -23,12 +23,18 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
import { BModal } from "bootstrap-vue";
import { copy } from "utils/clipboard";

import GLink from "@/component-library/GLink.vue";
import JobInformation from "components/JobInformation/JobInformation.vue";

library.add(faLink);

export default {
components: { BModal, JobInformation, FontAwesomeIcon },
components: {
GLink,
BModal,
JobInformation,
FontAwesomeIcon,
},
props: {
historyExport: {
type: Object,
Expand Down
7 changes: 5 additions & 2 deletions client/src/components/Libraries/LibrariesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
rows="3" />

<div v-else-if="row.item.deleted && includeDeleted" class="deleted-item">{{ row.item.name }}</div>
<b-link v-else :to="{ path: `/libraries/folders/${row.item.root_folder_id}` }">
<GLink v-else :to="{ path: `/libraries/folders/${row.item.root_folder_id}` }">
{{ row.item.name }}
</b-link>
</GLink>
</template>
<template v-slot:cell(description)="{ item }">
<LibraryEditField
Expand Down Expand Up @@ -198,12 +198,15 @@ import { useUserStore } from "@/stores/userStore";
import { Services } from "./services";
import { fields } from "./table-fields";

import GLink from "@/component-library/GLink.vue";

initLibrariesIcons();

Vue.use(BootstrapVue);

export default {
components: {
GLink,
FontAwesomeIcon,
LibraryEditField,
SearchField,
Expand Down
11 changes: 7 additions & 4 deletions client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,20 @@
<textarea v-else :ref="'name' + row.item.id" class="form-control" :value="row.item.name" rows="3" />
</div>
<div v-else-if="!row.item.deleted">
<b-link
<GLink
v-if="row.item.type === 'folder'"
:to="{ name: `LibraryFolder`, params: { folder_id: `${row.item.id}` } }">
{{ row.item.name }}
</b-link>
</GLink>

<b-link
<GLink
v-else
:to="{
name: `LibraryDataset`,
params: { folder_id: folder_id, dataset_id: `${row.item.id}` },
}">
{{ row.item.name }}
</b-link>
</GLink>
</div>
<!-- Deleted Item-->
<div v-else>
Expand Down Expand Up @@ -279,6 +279,8 @@ import { Services } from "./services";
import { fields } from "./table-fields";
import FolderTopBar from "./TopToolbar/FolderTopBar";

import GLink from "@/component-library/GLink.vue";

initFolderTableIcons();

Vue.use(BootstrapVue);
Expand All @@ -295,6 +297,7 @@ function initialFolderState() {
}
export default {
components: {
GLink,
FolderTopBar,
UtcDate,
FontAwesomeIcon,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</pre>
</div>
<div v-else>No content found.</div>
<b-link v-if="itemContent.truncated" :href="itemContent.item_url"> Show More... </b-link>
<GLink v-if="itemContent.truncated" :href="itemContent.item_url"> Show More... </GLink>
</div>
</UrlDataProvider>
</UrlDataProvider>
Expand All @@ -99,8 +99,11 @@ import LoadingSpan from "components/LoadingSpan";
import { UrlDataProvider } from "components/providers/UrlDataProvider";
import { getAppRoot } from "onload/loadConfig";

import GLink from "@/component-library/GLink.vue";

export default {
components: {
GLink,
LoadingSpan,
UrlDataProvider,
},
Expand Down
11 changes: 7 additions & 4 deletions client/src/components/Markdown/Elements/HistoryLink.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template>
<div>
<b-link
<GLink
v-if="showLink"
data-description="history import link"
:data-history-id="args.history_id"
@click="onClick"
>Click to Import History: {{ name }}.</b-link
>
@click="onClick">
Click to Import History: {{ name }}.
</GLink>
<div v-if="imported" class="text-success">
<font-awesome-icon icon="check" class="mr-1" />
<span>Successfully Imported History: {{ name }}!</span>
Expand All @@ -27,10 +27,13 @@ import { withPrefix } from "utils/redirect";
import { errorMessageAsString } from "utils/simple-error";
import Vue from "vue";

import GLink from "@/component-library/GLink.vue";

Vue.use(BootstrapVue);

export default {
components: {
GLink,
FontAwesomeIcon,
},
props: {
Expand Down
5 changes: 3 additions & 2 deletions client/src/components/Markdown/MarkdownContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import JobParameters from "./Elements/JobParameters.vue";
import ToolStd from "./Elements/ToolStd.vue";
import Visualization from "./Elements/Visualization.vue";
import WorkflowDisplay from "./Elements/Workflow/WorkflowDisplay.vue";
import GLink from "@/component-library/GLink.vue";

const toggle = ref(false);
const props = defineProps({
Expand Down Expand Up @@ -65,9 +66,9 @@ const isVisible = computed(() => !isCollapsible.value || toggle.value);

<template>
<div>
<b-link v-if="isCollapsible" class="font-weight-bold" @click="toggle = !toggle">
<GLink v-if="isCollapsible" class="font-weight-bold" @click="toggle = !toggle">
{{ args.collapse }}
</b-link>
</GLink>
<b-collapse :visible="isVisible">
<div v-if="name == 'generate_galaxy_version'" class="galaxy-version">
<pre><code>{{ version }}</code></pre>
Expand Down
13 changes: 9 additions & 4 deletions client/src/components/Masthead/QuotaMeter.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<template>
<div>
<div v-if="!hasQuota" class="quota-text d-flex align-items-center">
<b-link
<GLink
v-b-tooltip.hover.left
to="/storage"
:disabled="isAnonymous"
class="ml-auto"
:title="title"
data-description="storage dashboard link">
{{ usingString + " " + totalUsageString }}
</b-link>
</GLink>
</div>
<div v-else class="quota-meter d-flex align-items-center">
<b-link
<GLink
v-b-tooltip.hover.left
class="quota-progress"
:disabled="isAnonymous"
Expand All @@ -23,7 +23,7 @@
<b-progress-bar aria-label="Quota usage" :value="usage" :variant="variant" />
</b-progress>
<span>{{ usingString + " " + usage.toFixed(0) }}%</span>
</b-link>
</GLink>
</div>
</div>
</template>
Expand All @@ -35,8 +35,13 @@ import { mapGetters } from "vuex";

import { useUserStore } from "@/stores/userStore";

import GLink from "@/component-library/GLink.vue";

export default {
name: "QuotaMeter",
components: {
GLink,
},
data() {
return {
usingString: this.l("Using"),
Expand Down
Loading