Skip to content

Commit 8c13b89

Browse files
authored
Add tooltips to disabled Confluence and Jira buttons; enhance popover styles (#2956)
Signed-off-by: Sameh16 <sameh_mohamed16@hotmail.com>
1 parent a0385f1 commit 8c13b89

File tree

6 files changed

+38
-20
lines changed

6 files changed

+38
-20
lines changed

frontend/src/config/integrations/confluence/components/confluence-connect.vue

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
<template>
2-
<div class="flex items-center gap-4">
3-
<!-- <lf-button type="secondary-ghost" @click="isDetailsModalOpen = true">-->
4-
<!-- <lf-icon name="circle-info" type="regular" />-->
5-
<!-- Details-->
6-
<!-- </lf-button>-->
7-
<lf-button type="secondary" @click="isConfluenceSettingsDrawerVisible = true">
2+
<lf-tooltip
3+
placement="top"
4+
content-class="!max-w-76 !p-3 !text-start"
5+
content="These integrations are temporarily disabled. Please contact the CM team for further questions."
6+
>
7+
<lf-button
8+
:disabled="true"
9+
type="secondary"
10+
@click="isConfluenceSettingsDrawerVisible = true"
11+
>
812
<lf-icon name="link-simple" />
913
<slot>Connect</slot>
1014
</lf-button>
11-
</div>
15+
</lf-tooltip>
16+
1217
<lf-confluence-settings-drawer
1318
v-if="isConfluenceSettingsDrawerVisible"
1419
v-model="isConfluenceSettingsDrawerVisible"
@@ -22,12 +27,13 @@
2227
import { defineProps, ref } from 'vue';
2328
import LfIcon from '@/ui-kit/icon/Icon.vue';
2429
import LfButton from '@/ui-kit/button/Button.vue';
30+
import LfTooltip from '@/ui-kit/tooltip/Tooltip.vue';
2531
import LfConfluenceSettingsDrawer from '@/config/integrations/confluence/components/confluence-settings-drawer.vue';
2632
2733
const props = defineProps<{
28-
integration: any,
29-
segmentId: string,
30-
grandparentId: string,
34+
integration: any;
35+
segmentId: string;
36+
grandparentId: string;
3137
}>();
3238
3339
const isConfluenceSettingsDrawerVisible = ref(false);

frontend/src/config/integrations/jira/components/jira-connect.vue

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<template>
2-
<div class="flex items-center gap-4">
3-
<!-- <lf-button type="secondary-ghost" @click="isDetailsModalOpen = true">-->
4-
<!-- <lf-icon name="circle-info" type="regular" />-->
5-
<!-- Details-->
6-
<!-- </lf-button>-->
7-
<lf-button type="secondary" @click="isJiraSettingsDrawerVisible = true">
2+
<lf-tooltip
3+
placement="top"
4+
content-class="!max-w-76 !p-3 !text-start"
5+
content="These integrations are temporarily disabled. Please contact the CM team for further questions."
6+
>
7+
<lf-button
8+
:disabled="true"
9+
type="secondary"
10+
@click="isJiraSettingsDrawerVisible = true"
11+
>
812
<lf-icon name="link-simple" />
913
<slot>Connect</slot>
1014
</lf-button>
11-
</div>
15+
</lf-tooltip>
1216
<lf-jira-settings-drawer
1317
v-if="isJiraSettingsDrawerVisible"
1418
v-model="isJiraSettingsDrawerVisible"
@@ -22,10 +26,11 @@
2226
import { defineProps, ref } from 'vue';
2327
import LfIcon from '@/ui-kit/icon/Icon.vue';
2428
import LfButton from '@/ui-kit/button/Button.vue';
29+
import LfTooltip from '@/ui-kit/tooltip/Tooltip.vue';
2530
import LfJiraSettingsDrawer from '@/config/integrations/jira/components/jira-settings-drawer.vue';
2631
2732
const props = defineProps<{
28-
integration: any,
33+
integration: any;
2934
segmentId: string | null;
3035
grandparentId: string | null;
3136
}>();

frontend/src/ui-kit/dropdown/Dropdown.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<lf-popover :placement="props.placement" :persistent="props.persistent">
2+
<lf-popover :placement="props.placement" :persistent="props.persistent" :is-dropdown="true">
33
<template #trigger>
44
<slot name="trigger" />
55
</template>

frontend/src/ui-kit/popover/Popover.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ref="popover"
1616
:style="popoverStyle"
1717
class="c-popover__content"
18-
:class="[`is-placed-${props.placement}`, { 'is-hidden': props.persistent && !isVisible }]"
18+
:class="[`is-placed-${props.placement}`, { 'is-hidden': props.persistent && !isVisible }, { 'popover-box': !props.isDropdown }]"
1919
>
2020
<slot :close="hidePopover" />
2121
</div>
@@ -37,13 +37,15 @@ const props = withDefaults(defineProps<{
3737
visibility?: boolean,
3838
triggerEvent?: PopoverTrigger,
3939
persistent?: boolean;
40+
isDropdown?: boolean;
4041
}>(), {
4142
placement: 'bottom-start',
4243
disabled: false,
4344
spacing: 4,
4445
visibility: false,
4546
triggerEvent: 'click',
4647
persistent: false,
48+
isDropdown: false,
4749
});
4850
4951
const emit = defineEmits<{(e: 'update:visibility', value: boolean): void }>();

frontend/src/ui-kit/popover/popover.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
&__content {
99
@apply absolute z-[2090] w-max transition-all overflow-visible;
1010

11+
&.popover-box {
12+
@apply text-sm bg-white min-w-34 p-3 rounded-md border-gray-200 border;
13+
14+
}
1115
&.is-hidden {
1216
@apply invisible opacity-0 pointer-events-none;
1317
}

frontend/tailwind.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const spacing = {
4343
65: "16.25rem",
4444
68: "17rem",
4545
70: "17.5rem",
46+
76: "19rem",
4647
88: "22rem",
4748
100: "25rem",
4849
104: "26rem",

0 commit comments

Comments
 (0)