Skip to content

FOUR-18631: Review the comments Component #7431

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.

Sign up for GitHub

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

Merged
pmPaulis merged 3 commits into from
Oct 1, 2024
Merged

FOUR-18631: Review the comments Component #7431

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a51fe26
FOUR-18631: SPIKE: Review the comments Component
hjonathan Sep 27, 2024
0cce034
FOUR-18631: SPIKE: Review the comments Component
hjonathan Sep 27, 2024
a40ba16
FOUR-18631: SPIKE: Review the comments Component
hjonathan Sep 30, 2024
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
49 changes: 49 additions & 0 deletions resources/jscomposition/base/ui/CollapsableContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<template>
<div
class="tw-flex tw-transition-all tw-duration-500"
:class="{ 'tw-w-0' : collapse}">
<slot name="left">
<div class="tw-relative tw-group tw-w-3">
<div class="tw-transition tw-duration-250 tw-w-[2px] tw-h-full">
<div
:class="{
'tw-visible' : collapse,
'tw-invisible' : !collapse,
}"
class="hover:tw-cursor-pointer tw-z-10
tw-transition-all tw-duration-250 group-hover:tw-ease-in
tw-flex tw-justify-center tw-items-center tw-text-[8px]
tw-border tw-border-gray-300 hover:tw-bg-gray-200 tw-bg-white group-hover:tw-visible
tw-absolute tw-left-[-12px] tw-top-[41px] tw-w-6 tw-h-6 tw-rounded-full"
@click.prevent="onClick">
<i
class="fa"
:class="{ 'fa-chevron-right' : !collapse, 'fa-chevron-left' : collapse }" />
</div>
</div>
</div>
</slot>

<div
class="tw-flex tw-w-full tw-transition-all tw-duration-500"
:class="{
'tw-opacity-0' : collapse,
'tw-opacity-100' : !collapse,
}">
<slot
name="default" />
</div>

<slot name="right" />
</div>
</template>

<script setup>
import { ref } from "vue";

const collapse = ref(false);

const onClick = () => {
collapse.value = !collapse.value;
};
</script>
120 changes: 0 additions & 120 deletions resources/jscomposition/base/ui/SimplePopover.vue
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions resources/jscomposition/base/ui/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import Badge from "./Badge.vue";
import SimplePopover from "./SimplePopover.vue";
import AppAvatar from "./AppAvatar.vue";
import AppPopover from "./AppPopover.vue";
import CollapsableContainer from "./CollapsableContainer.vue";

export default {};

export { Badge, SimplePopover, AppAvatar, AppPopover};
export {
Badge, AppAvatar, AppPopover, CollapsableContainer,
};
8 changes: 3 additions & 5 deletions resources/jscomposition/cases/casesDetail/components/CaseDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<template>
<div class="tw-pb-4">
<Tabs
:tab-default="tabDefault"
:tabs="tabs" />
</div>
<Tabs
:tab-default="tabDefault"
:tabs="tabs" />
</template>

<script>
Expand Down
10 changes: 6 additions & 4 deletions resources/jscomposition/cases/casesDetail/components/Tabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="tw-block">
<div class="tw-flex tw-flex-col tw-pointer-events-auto">
<nav
class="tw-mb-px tw-flex tw-space-x-8"
class="tw-mb-px tw-flex tw-space-x-2 tw-border-b tw-border-gray-300"
aria-label="Tabs">
<template v-for="(tab, index) in tabs">
<a
Expand All @@ -18,8 +18,10 @@
</a>
</template>
</nav>
<div class="tw-mt-3">
<component :is="content" />
<div class="tw-grow tw-overflow-hidden">
<slot :name="`${tabSelected}`">
<component :is="content" />
</slot>
</div>
</div>
</template>
Expand Down
4 changes: 2 additions & 2 deletions resources/jscomposition/cases/casesDetail/components/TaskTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div class="tw-w-full tw-space-y-3 tw-flex tw-flex-col tw-overflow-hidden">
<div class="tw-flex tw-flex-col tw-w-full tw-py-3 tw-overflow-hidden tw-space-y-3">
<SortTable
id="task-table"
:columns="columnsConfig"
:data="data"
class="tw-grow tw-overflow-y-scroll"
class="tw-grow tw-overflow-y-scroll tw-overflow-hidden"
@changeFilter="onChangeFilter" />

<Pagination
Expand Down
16 changes: 15 additions & 1 deletion resources/jscomposition/cases/casesDetail/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import Vue from "vue";
import CaseDetail from "./components/CaseDetail.vue";
import Tabs from "./components/Tabs.vue";
import Timeline from "../../../js/components/Timeline.vue";
import { CollapsableContainer } from "../../base";

Vue.component("Timeline", Timeline);

new Vue({
el: "#case-detail",
components: { CaseDetail },
components: { CaseDetail, Tabs, CollapsableContainer},
data() {
return {
activeTab: "pending",
Expand Down Expand Up @@ -37,6 +39,18 @@ new Vue({
showTree: false,
showTabs: true,
showInfo: true,

tabDefault: 'details',
tabs : [
{
name: "Details", href: "#tasks", current: "details", show: true, content: null,
Comment thread
pmPaulis marked this conversation as resolved.
Outdated
},
{
name: "Comments", href: "#comments", current: "comments", show: true, content: null,
},
],
headerModel: false

};
},
computed: {
Expand Down
Loading