FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into from
Jan 23, 2025
Merged

FOUR-20265: UI Update in the modal to show the process name and task related #7927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bcbed7
FOUR-20265: UI Update in the modal to show the process name and task …
hjonathan Jan 23, 2025
eebbe02
FOUR-20265: UI Update in the modal to show the process name and task …
hjonathan Jan 23, 2025
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
30 changes: 26 additions & 4 deletions resources/jscomposition/cases/casesMain/config/columns.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
ParticipantsCell,
StatusCell,
LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
resizable: true,
width: 200,
cellRenderer: () => ({
component: TruncatedOptionsCell,
component: TruncatedGroupOptionsCell,
params: {
href: (option) => `/tasks/${option.id}/edit`,
formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
if (row.case_status === "COMPLETED") {
return [];
}
return row.tasks.filter((el) => el.status === "ACTIVE");

const groupedTasks = row.tasks.reduce((acc, task) => {
if (task.status !== "ACTIVE") {
return acc;
}

const processId = task.process_id;
const existGroup = acc.find((group) => group.process_id === processId);

if (existGroup) {
existGroup.options.push(task);
} else {
acc.push({
process_id: processId,
options: [task],
...row.processes.find((process) => process.id === processId),
});
}

return acc;
}, []);

return groupedTasks;
},
},
}),
Expand Down
2 changes: 2 additions & 0 deletions resources/jscomposition/system/table/cell/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
ParticipantsCell,
TruncatedGroupOptionsCell,
TruncatedOptionsCell,
StatusCell,
CaseTitleCell,
Expand Down
61 changes: 61 additions & 0 deletions resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
<li class="tw-py-0 tw-px-5 tw-text-sm">
<a
v-if="href !== null"
class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
:href="href(option)">
{{ getValueOption(option) }}
</a>
<span
v-else
class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
@click.prevent.stop="onClickOption(option)">
{{ getValueOption(option) }}
</span>
</li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
props: {
columns: {
type: Array,
default: () => [],
},
column: {
type: Object,
default: () => ({}),
},
row: {
type: Object,
default: () => ({}),
},
option: {
type: Object,
default: () => ({}),
},
formatterOptions: {
type: Function,
default: new Function(),
},
href: {
type: Function,
default: null,
},
},
setup(props) {
const getValueOption = (option) => {
if (typeof props.formatterOptions === "function") {
return props.formatterOptions(option, props.row, props.column, props.columns);
}
return "";
};

return {
getValueOption,
};
},
});
</script>
48 changes: 48 additions & 0 deletions resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
<div
class="tw-flex tw-px-4 tw-text-gray-400
tw-text-xs tw-italic tw-space-x-2 tw-items-center">
<i class="fp-play-outline tw-text-base" />
<span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
</div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
props: {
columns: {
type: Array,
default: () => [],
},
column: {
type: Object,
default: () => ({}),
},
row: {
type: Object,
default: () => ({}),
},
option: {
type: Object,
default: () => ({}),
},
formatterOptions: {
type: Function,
default: new Function(),
},
},
setup(props) {
const getValueOption = (option) => {
if (typeof props.formatterOptions === "function") {
return props.formatterOptions(option, props.row, props.column, props.columns);
}
return "";
};

return {
getValueOption,
};
},
});
</script>
149 changes: 149 additions & 0 deletions ...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
<div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
<div
v-if="optionsModel.length && optionsModel[0]?.options"
class="tw-overflow-hidden tw-text-ellipsis">
<a
v-if="href !== null"
class="hover:tw-text-blue-400 tw-text-gray-500"
:href="href(optionsModel[0].options[0])">
{{ getValueOption(optionsModel[0].options[0]) }}
</a>
<span
v-else
class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
href="#"
@click.prevent.stop="onClickOption(optionsModel[0].options[0])">
{{ getValueOption(optionsModel[0].options[0]) }}
</span>
</div>
<AppPopover
v-if="optionsModel.length"
v-model="show"
:hover="false"
position="bottom"
class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
<div
class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
@click.prevent="onClick">
<i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
</div>
<template #content>
<ul
class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
tw-max-w-80 tw-min-w-50
tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
<li
v-for="(optionTitle, indexTitle) in optionsModel"
:key="indexTitle">
<TitleOption
:formatter-options="formatterOptions"
:option="optionTitle"
:columns="columns"
:row="row"
:column="column" />

<ul
class="tw-list-disc tw-list-inside">
<BaseOption
v-for="(option, index) in optionTitle.options"
:key="index"
:formatter-options="formatterOptions"
:option="option"
:columns="columns"
:row="row"
:href="href"
:column="column" />
</ul>
</li>
</ul>
</template>
</AppPopover>
</div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
components: {
AppPopover,
TitleOption,
BaseOption,
},
props: {
columns: {
type: Array,
default: () => [],
},
column: {
type: Object,
default: () => ({}),
},
row: {
type: Object,
default: () => ({}),
},
click: {
type: Function,
default: new Function(),
},
formatterOptions: {
type: Function,
default: new Function(),
},
href: {
type: Function,
default: null,
},
// Filter Data, method to filter the input data
formatData: {
type: Function,
default: null,
},
},
setup(props) {
const show = ref(false);
const optionsModel = ref(props.row[props.column.field]);

const getValueOption = (option) => {
if (isFunction(props.formatterOptions)) {
return props.formatterOptions(option, props.row, props.column, props.columns);
}
return "";
};

const onClick = () => {
show.value = !show.value;
};

const onClickOption = (option, index) => {
props.click && props.click(option, props.row, props.column, props.columns);
};

const onClose = () => {
show.value = false;
};

onMounted(() => {
// Filter the data before render
if (props.formatData) {
optionsModel.value = props.formatData(props.row, props.column, props.columns);
}
});

return {
show,
optionsModel,
onClose,
onClickOption,
onClick,
getValueOption,
};
},
});
</script>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20265: UI Update in the modal to show the process name and task related
#7927
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4bcbed7

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025
eebbe02

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025

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


30 changes: 26 additions & 4 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
 CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
 ParticipantsCell,
 StatusCell,
 LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
 resizable: true,
 width: 200,
 cellRenderer: () => ({
 component: TruncatedOptionsCell,
 component: TruncatedGroupOptionsCell,
 params: {
 href: (option) => `/tasks/${option.id}/edit`,
 formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
 if (row.case_status === "COMPLETED") {
 return [];
 }
 return row.tasks.filter((el) => el.status === "ACTIVE");

 const groupedTasks = row.tasks.reduce((acc, task) => {
 if (task.status !== "ACTIVE") {
 return acc;
 }

 const processId = task.process_id;
 const existGroup = acc.find((group) => group.process_id === processId);

 if (existGroup) {
 existGroup.options.push(task);
 } else {
 acc.push({
 process_id: processId,
 options: [task],
 ...row.processes.find((process) => process.id === processId),
 });
 }

 return acc;
 }, []);

 return groupedTasks;
 },
 },
 }),
Expand Down

2 changes: 2 additions & 0 deletions
resources/jscomposition/system/table/cell/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
 ParticipantsCell,
 TruncatedGroupOptionsCell,
 TruncatedOptionsCell,
 StatusCell,
 CaseTitleCell,
Expand Down

61 changes: 61 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
 <li class="tw-py-0 tw-px-5 tw-text-sm">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 :href="href(option)">
 {{ getValueOption(option) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 @click.prevent.stop="onClickOption(option)">
 {{ getValueOption(option) }}
 </span>
 </li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

48 changes: 48 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
 <div
 class="tw-flex tw-px-4 tw-text-gray-400
 tw-text-xs tw-italic tw-space-x-2 tw-items-center">
 <i class="fp-play-outline tw-text-base" />
 <span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
 </div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

149 changes: 149 additions & 0 deletions
...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
 <div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
 <div
 v-if="optionsModel.length && optionsModel[0]?.options"
 class="tw-overflow-hidden tw-text-ellipsis">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500"
 :href="href(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
 href="#"
 @click.prevent.stop="onClickOption(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </span>
 </div>
 <AppPopover
 v-if="optionsModel.length"
 v-model="show"
 :hover="false"
 position="bottom"
 class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
 <div
 class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
 hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
 @click.prevent="onClick">
 <i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
 </div>
 <template #content>
 <ul
 class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
 tw-max-w-80 tw-min-w-50
 tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
 <li
 v-for="(optionTitle, indexTitle) in optionsModel"
 :key="indexTitle">
 <TitleOption
 :formatter-options="formatterOptions"
 :option="optionTitle"
 :columns="columns"
 :row="row"
 :column="column" />

 <ul
 class="tw-list-disc tw-list-inside">
 <BaseOption
 v-for="(option, index) in optionTitle.options"
 :key="index"
 :formatter-options="formatterOptions"
 :option="option"
 :columns="columns"
 :row="row"
 :href="href"
 :column="column" />
 </ul>
 </li>
 </ul>
 </template>
 </AppPopover>
 </div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
 components: {
 AppPopover,
 TitleOption,
 BaseOption,
 },
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 click: {
 type: Function,
 default: new Function(),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 // Filter Data, method to filter the input data
 formatData: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const show = ref(false);
 const optionsModel = ref(props.row[props.column.field]);

 const getValueOption = (option) => {
 if (isFunction(props.formatterOptions)) {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 const onClick = () => {
 show.value = !show.value;
 };

 const onClickOption = (option, index) => {
 props.click && props.click(option, props.row, props.column, props.columns);
 };

 const onClose = () => {
 show.value = false;
 };

 onMounted(() => {
 // Filter the data before render
 if (props.formatData) {
 optionsModel.value = props.formatData(props.row, props.column, props.columns);
 }
 });

 return {
 show,
 optionsModel,
 onClose,
 onClickOption,
 onClick,
 getValueOption,
 };
 },
});
</script>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20265: UI Update in the modal to show the process name and task related
#7927
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4bcbed7

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025
eebbe02

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025

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


30 changes: 26 additions & 4 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
 CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
 ParticipantsCell,
 StatusCell,
 LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
 resizable: true,
 width: 200,
 cellRenderer: () => ({
 component: TruncatedOptionsCell,
 component: TruncatedGroupOptionsCell,
 params: {
 href: (option) => `/tasks/${option.id}/edit`,
 formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
 if (row.case_status === "COMPLETED") {
 return [];
 }
 return row.tasks.filter((el) => el.status === "ACTIVE");

 const groupedTasks = row.tasks.reduce((acc, task) => {
 if (task.status !== "ACTIVE") {
 return acc;
 }

 const processId = task.process_id;
 const existGroup = acc.find((group) => group.process_id === processId);

 if (existGroup) {
 existGroup.options.push(task);
 } else {
 acc.push({
 process_id: processId,
 options: [task],
 ...row.processes.find((process) => process.id === processId),
 });
 }

 return acc;
 }, []);

 return groupedTasks;
 },
 },
 }),
Expand Down

2 changes: 2 additions & 0 deletions
resources/jscomposition/system/table/cell/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
 ParticipantsCell,
 TruncatedGroupOptionsCell,
 TruncatedOptionsCell,
 StatusCell,
 CaseTitleCell,
Expand Down

61 changes: 61 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
 <li class="tw-py-0 tw-px-5 tw-text-sm">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 :href="href(option)">
 {{ getValueOption(option) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 @click.prevent.stop="onClickOption(option)">
 {{ getValueOption(option) }}
 </span>
 </li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

48 changes: 48 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
 <div
 class="tw-flex tw-px-4 tw-text-gray-400
 tw-text-xs tw-italic tw-space-x-2 tw-items-center">
 <i class="fp-play-outline tw-text-base" />
 <span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
 </div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

149 changes: 149 additions & 0 deletions
...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
 <div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
 <div
 v-if="optionsModel.length && optionsModel[0]?.options"
 class="tw-overflow-hidden tw-text-ellipsis">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500"
 :href="href(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
 href="#"
 @click.prevent.stop="onClickOption(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </span>
 </div>
 <AppPopover
 v-if="optionsModel.length"
 v-model="show"
 :hover="false"
 position="bottom"
 class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
 <div
 class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
 hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
 @click.prevent="onClick">
 <i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
 </div>
 <template #content>
 <ul
 class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
 tw-max-w-80 tw-min-w-50
 tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
 <li
 v-for="(optionTitle, indexTitle) in optionsModel"
 :key="indexTitle">
 <TitleOption
 :formatter-options="formatterOptions"
 :option="optionTitle"
 :columns="columns"
 :row="row"
 :column="column" />

 <ul
 class="tw-list-disc tw-list-inside">
 <BaseOption
 v-for="(option, index) in optionTitle.options"
 :key="index"
 :formatter-options="formatterOptions"
 :option="option"
 :columns="columns"
 :row="row"
 :href="href"
 :column="column" />
 </ul>
 </li>
 </ul>
 </template>
 </AppPopover>
 </div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
 components: {
 AppPopover,
 TitleOption,
 BaseOption,
 },
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 click: {
 type: Function,
 default: new Function(),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 // Filter Data, method to filter the input data
 formatData: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const show = ref(false);
 const optionsModel = ref(props.row[props.column.field]);

 const getValueOption = (option) => {
 if (isFunction(props.formatterOptions)) {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 const onClick = () => {
 show.value = !show.value;
 };

 const onClickOption = (option, index) => {
 props.click && props.click(option, props.row, props.column, props.columns);
 };

 const onClose = () => {
 show.value = false;
 };

 onMounted(() => {
 // Filter the data before render
 if (props.formatData) {
 optionsModel.value = props.formatData(props.row, props.column, props.columns);
 }
 });

 return {
 show,
 optionsModel,
 onClose,
 onClickOption,
 onClick,
 getValueOption,
 };
 },
});
</script>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20265: UI Update in the modal to show the process name and task related
#7927
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4bcbed7

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025
eebbe02

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025

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


30 changes: 26 additions & 4 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
 CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
 ParticipantsCell,
 StatusCell,
 LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
 resizable: true,
 width: 200,
 cellRenderer: () => ({
 component: TruncatedOptionsCell,
 component: TruncatedGroupOptionsCell,
 params: {
 href: (option) => `/tasks/${option.id}/edit`,
 formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
 if (row.case_status === "COMPLETED") {
 return [];
 }
 return row.tasks.filter((el) => el.status === "ACTIVE");

 const groupedTasks = row.tasks.reduce((acc, task) => {
 if (task.status !== "ACTIVE") {
 return acc;
 }

 const processId = task.process_id;
 const existGroup = acc.find((group) => group.process_id === processId);

 if (existGroup) {
 existGroup.options.push(task);
 } else {
 acc.push({
 process_id: processId,
 options: [task],
 ...row.processes.find((process) => process.id === processId),
 });
 }

 return acc;
 }, []);

 return groupedTasks;
 },
 },
 }),
Expand Down

2 changes: 2 additions & 0 deletions
resources/jscomposition/system/table/cell/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
 ParticipantsCell,
 TruncatedGroupOptionsCell,
 TruncatedOptionsCell,
 StatusCell,
 CaseTitleCell,
Expand Down

61 changes: 61 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
 <li class="tw-py-0 tw-px-5 tw-text-sm">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 :href="href(option)">
 {{ getValueOption(option) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 @click.prevent.stop="onClickOption(option)">
 {{ getValueOption(option) }}
 </span>
 </li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

48 changes: 48 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
 <div
 class="tw-flex tw-px-4 tw-text-gray-400
 tw-text-xs tw-italic tw-space-x-2 tw-items-center">
 <i class="fp-play-outline tw-text-base" />
 <span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
 </div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

149 changes: 149 additions & 0 deletions
...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
 <div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
 <div
 v-if="optionsModel.length && optionsModel[0]?.options"
 class="tw-overflow-hidden tw-text-ellipsis">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500"
 :href="href(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
 href="#"
 @click.prevent.stop="onClickOption(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </span>
 </div>
 <AppPopover
 v-if="optionsModel.length"
 v-model="show"
 :hover="false"
 position="bottom"
 class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
 <div
 class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
 hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
 @click.prevent="onClick">
 <i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
 </div>
 <template #content>
 <ul
 class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
 tw-max-w-80 tw-min-w-50
 tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
 <li
 v-for="(optionTitle, indexTitle) in optionsModel"
 :key="indexTitle">
 <TitleOption
 :formatter-options="formatterOptions"
 :option="optionTitle"
 :columns="columns"
 :row="row"
 :column="column" />

 <ul
 class="tw-list-disc tw-list-inside">
 <BaseOption
 v-for="(option, index) in optionTitle.options"
 :key="index"
 :formatter-options="formatterOptions"
 :option="option"
 :columns="columns"
 :row="row"
 :href="href"
 :column="column" />
 </ul>
 </li>
 </ul>
 </template>
 </AppPopover>
 </div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
 components: {
 AppPopover,
 TitleOption,
 BaseOption,
 },
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 click: {
 type: Function,
 default: new Function(),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 // Filter Data, method to filter the input data
 formatData: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const show = ref(false);
 const optionsModel = ref(props.row[props.column.field]);

 const getValueOption = (option) => {
 if (isFunction(props.formatterOptions)) {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 const onClick = () => {
 show.value = !show.value;
 };

 const onClickOption = (option, index) => {
 props.click && props.click(option, props.row, props.column, props.columns);
 };

 const onClose = () => {
 show.value = false;
 };

 onMounted(() => {
 // Filter the data before render
 if (props.formatData) {
 optionsModel.value = props.formatData(props.row, props.column, props.columns);
 }
 });

 return {
 show,
 optionsModel,
 onClose,
 onClickOption,
 onClick,
 getValueOption,
 };
 },
});
</script>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20265: UI Update in the modal to show the process name and task related
#7927
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4bcbed7

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025
eebbe02

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025

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


30 changes: 26 additions & 4 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
 CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
 ParticipantsCell,
 StatusCell,
 LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
 resizable: true,
 width: 200,
 cellRenderer: () => ({
 component: TruncatedOptionsCell,
 component: TruncatedGroupOptionsCell,
 params: {
 href: (option) => `/tasks/${option.id}/edit`,
 formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
 if (row.case_status === "COMPLETED") {
 return [];
 }
 return row.tasks.filter((el) => el.status === "ACTIVE");

 const groupedTasks = row.tasks.reduce((acc, task) => {
 if (task.status !== "ACTIVE") {
 return acc;
 }

 const processId = task.process_id;
 const existGroup = acc.find((group) => group.process_id === processId);

 if (existGroup) {
 existGroup.options.push(task);
 } else {
 acc.push({
 process_id: processId,
 options: [task],
 ...row.processes.find((process) => process.id === processId),
 });
 }

 return acc;
 }, []);

 return groupedTasks;
 },
 },
 }),
Expand Down

2 changes: 2 additions & 0 deletions
resources/jscomposition/system/table/cell/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
 ParticipantsCell,
 TruncatedGroupOptionsCell,
 TruncatedOptionsCell,
 StatusCell,
 CaseTitleCell,
Expand Down

61 changes: 61 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
 <li class="tw-py-0 tw-px-5 tw-text-sm">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 :href="href(option)">
 {{ getValueOption(option) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 @click.prevent.stop="onClickOption(option)">
 {{ getValueOption(option) }}
 </span>
 </li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

48 changes: 48 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
 <div
 class="tw-flex tw-px-4 tw-text-gray-400
 tw-text-xs tw-italic tw-space-x-2 tw-items-center">
 <i class="fp-play-outline tw-text-base" />
 <span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
 </div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

149 changes: 149 additions & 0 deletions
...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
 <div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
 <div
 v-if="optionsModel.length && optionsModel[0]?.options"
 class="tw-overflow-hidden tw-text-ellipsis">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500"
 :href="href(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
 href="#"
 @click.prevent.stop="onClickOption(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </span>
 </div>
 <AppPopover
 v-if="optionsModel.length"
 v-model="show"
 :hover="false"
 position="bottom"
 class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
 <div
 class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
 hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
 @click.prevent="onClick">
 <i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
 </div>
 <template #content>
 <ul
 class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
 tw-max-w-80 tw-min-w-50
 tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
 <li
 v-for="(optionTitle, indexTitle) in optionsModel"
 :key="indexTitle">
 <TitleOption
 :formatter-options="formatterOptions"
 :option="optionTitle"
 :columns="columns"
 :row="row"
 :column="column" />

 <ul
 class="tw-list-disc tw-list-inside">
 <BaseOption
 v-for="(option, index) in optionTitle.options"
 :key="index"
 :formatter-options="formatterOptions"
 :option="option"
 :columns="columns"
 :row="row"
 :href="href"
 :column="column" />
 </ul>
 </li>
 </ul>
 </template>
 </AppPopover>
 </div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
 components: {
 AppPopover,
 TitleOption,
 BaseOption,
 },
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 click: {
 type: Function,
 default: new Function(),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 // Filter Data, method to filter the input data
 formatData: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const show = ref(false);
 const optionsModel = ref(props.row[props.column.field]);

 const getValueOption = (option) => {
 if (isFunction(props.formatterOptions)) {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 const onClick = () => {
 show.value = !show.value;
 };

 const onClickOption = (option, index) => {
 props.click && props.click(option, props.row, props.column, props.columns);
 };

 const onClose = () => {
 show.value = false;
 };

 onMounted(() => {
 // Filter the data before render
 if (props.formatData) {
 optionsModel.value = props.formatData(props.row, props.column, props.columns);
 }
 });

 return {
 show,
 optionsModel,
 onClose,
 onClickOption,
 onClick,
 getValueOption,
 };
 },
});
</script>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20265: UI Update in the modal to show the process name and task related
#7927
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4bcbed7

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025
eebbe02

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025

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


30 changes: 26 additions & 4 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
 CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
 ParticipantsCell,
 StatusCell,
 LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
 resizable: true,
 width: 200,
 cellRenderer: () => ({
 component: TruncatedOptionsCell,
 component: TruncatedGroupOptionsCell,
 params: {
 href: (option) => `/tasks/${option.id}/edit`,
 formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
 if (row.case_status === "COMPLETED") {
 return [];
 }
 return row.tasks.filter((el) => el.status === "ACTIVE");

 const groupedTasks = row.tasks.reduce((acc, task) => {
 if (task.status !== "ACTIVE") {
 return acc;
 }

 const processId = task.process_id;
 const existGroup = acc.find((group) => group.process_id === processId);

 if (existGroup) {
 existGroup.options.push(task);
 } else {
 acc.push({
 process_id: processId,
 options: [task],
 ...row.processes.find((process) => process.id === processId),
 });
 }

 return acc;
 }, []);

 return groupedTasks;
 },
 },
 }),
Expand Down

2 changes: 2 additions & 0 deletions
resources/jscomposition/system/table/cell/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
 ParticipantsCell,
 TruncatedGroupOptionsCell,
 TruncatedOptionsCell,
 StatusCell,
 CaseTitleCell,
Expand Down

61 changes: 61 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
 <li class="tw-py-0 tw-px-5 tw-text-sm">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 :href="href(option)">
 {{ getValueOption(option) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 @click.prevent.stop="onClickOption(option)">
 {{ getValueOption(option) }}
 </span>
 </li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

48 changes: 48 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
 <div
 class="tw-flex tw-px-4 tw-text-gray-400
 tw-text-xs tw-italic tw-space-x-2 tw-items-center">
 <i class="fp-play-outline tw-text-base" />
 <span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
 </div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

149 changes: 149 additions & 0 deletions
...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
 <div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
 <div
 v-if="optionsModel.length && optionsModel[0]?.options"
 class="tw-overflow-hidden tw-text-ellipsis">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500"
 :href="href(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
 href="#"
 @click.prevent.stop="onClickOption(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </span>
 </div>
 <AppPopover
 v-if="optionsModel.length"
 v-model="show"
 :hover="false"
 position="bottom"
 class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
 <div
 class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
 hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
 @click.prevent="onClick">
 <i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
 </div>
 <template #content>
 <ul
 class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
 tw-max-w-80 tw-min-w-50
 tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
 <li
 v-for="(optionTitle, indexTitle) in optionsModel"
 :key="indexTitle">
 <TitleOption
 :formatter-options="formatterOptions"
 :option="optionTitle"
 :columns="columns"
 :row="row"
 :column="column" />

 <ul
 class="tw-list-disc tw-list-inside">
 <BaseOption
 v-for="(option, index) in optionTitle.options"
 :key="index"
 :formatter-options="formatterOptions"
 :option="option"
 :columns="columns"
 :row="row"
 :href="href"
 :column="column" />
 </ul>
 </li>
 </ul>
 </template>
 </AppPopover>
 </div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
 components: {
 AppPopover,
 TitleOption,
 BaseOption,
 },
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 click: {
 type: Function,
 default: new Function(),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 // Filter Data, method to filter the input data
 formatData: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const show = ref(false);
 const optionsModel = ref(props.row[props.column.field]);

 const getValueOption = (option) => {
 if (isFunction(props.formatterOptions)) {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 const onClick = () => {
 show.value = !show.value;
 };

 const onClickOption = (option, index) => {
 props.click && props.click(option, props.row, props.column, props.columns);
 };

 const onClose = () => {
 show.value = false;
 };

 onMounted(() => {
 // Filter the data before render
 if (props.formatData) {
 optionsModel.value = props.formatData(props.row, props.column, props.columns);
 }
 });

 return {
 show,
 optionsModel,
 onClose,
 onClickOption,
 onClick,
 getValueOption,
 };
 },
});
</script>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20265: UI Update in the modal to show the process name and task related
#7927
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4bcbed7

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025
eebbe02

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025

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


30 changes: 26 additions & 4 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
 CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
 ParticipantsCell,
 StatusCell,
 LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
 resizable: true,
 width: 200,
 cellRenderer: () => ({
 component: TruncatedOptionsCell,
 component: TruncatedGroupOptionsCell,
 params: {
 href: (option) => `/tasks/${option.id}/edit`,
 formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
 if (row.case_status === "COMPLETED") {
 return [];
 }
 return row.tasks.filter((el) => el.status === "ACTIVE");

 const groupedTasks = row.tasks.reduce((acc, task) => {
 if (task.status !== "ACTIVE") {
 return acc;
 }

 const processId = task.process_id;
 const existGroup = acc.find((group) => group.process_id === processId);

 if (existGroup) {
 existGroup.options.push(task);
 } else {
 acc.push({
 process_id: processId,
 options: [task],
 ...row.processes.find((process) => process.id === processId),
 });
 }

 return acc;
 }, []);

 return groupedTasks;
 },
 },
 }),
Expand Down

2 changes: 2 additions & 0 deletions
resources/jscomposition/system/table/cell/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
 ParticipantsCell,
 TruncatedGroupOptionsCell,
 TruncatedOptionsCell,
 StatusCell,
 CaseTitleCell,
Expand Down

61 changes: 61 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
 <li class="tw-py-0 tw-px-5 tw-text-sm">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 :href="href(option)">
 {{ getValueOption(option) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 @click.prevent.stop="onClickOption(option)">
 {{ getValueOption(option) }}
 </span>
 </li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

48 changes: 48 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
 <div
 class="tw-flex tw-px-4 tw-text-gray-400
 tw-text-xs tw-italic tw-space-x-2 tw-items-center">
 <i class="fp-play-outline tw-text-base" />
 <span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
 </div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

149 changes: 149 additions & 0 deletions
...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
 <div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
 <div
 v-if="optionsModel.length && optionsModel[0]?.options"
 class="tw-overflow-hidden tw-text-ellipsis">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500"
 :href="href(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
 href="#"
 @click.prevent.stop="onClickOption(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </span>
 </div>
 <AppPopover
 v-if="optionsModel.length"
 v-model="show"
 :hover="false"
 position="bottom"
 class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
 <div
 class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
 hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
 @click.prevent="onClick">
 <i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
 </div>
 <template #content>
 <ul
 class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
 tw-max-w-80 tw-min-w-50
 tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
 <li
 v-for="(optionTitle, indexTitle) in optionsModel"
 :key="indexTitle">
 <TitleOption
 :formatter-options="formatterOptions"
 :option="optionTitle"
 :columns="columns"
 :row="row"
 :column="column" />

 <ul
 class="tw-list-disc tw-list-inside">
 <BaseOption
 v-for="(option, index) in optionTitle.options"
 :key="index"
 :formatter-options="formatterOptions"
 :option="option"
 :columns="columns"
 :row="row"
 :href="href"
 :column="column" />
 </ul>
 </li>
 </ul>
 </template>
 </AppPopover>
 </div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
 components: {
 AppPopover,
 TitleOption,
 BaseOption,
 },
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 click: {
 type: Function,
 default: new Function(),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 // Filter Data, method to filter the input data
 formatData: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const show = ref(false);
 const optionsModel = ref(props.row[props.column.field]);

 const getValueOption = (option) => {
 if (isFunction(props.formatterOptions)) {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 const onClick = () => {
 show.value = !show.value;
 };

 const onClickOption = (option, index) => {
 props.click && props.click(option, props.row, props.column, props.columns);
 };

 const onClose = () => {
 show.value = false;
 };

 onMounted(() => {
 // Filter the data before render
 if (props.formatData) {
 optionsModel.value = props.formatData(props.row, props.column, props.columns);
 }
 });

 return {
 show,
 optionsModel,
 onClose,
 onClickOption,
 onClick,
 getValueOption,
 };
 },
});
</script>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
FOUR-20265: UI Update in the modal to show the process name and task related#7927

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 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20265: UI Update in the modal to show the process name and task related
#7927
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4bcbed7

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025
eebbe02

FOUR-20265: UI Update in the modal to show the process name and task …


hjonathan Jan 23, 2025

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


30 changes: 26 additions & 4 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { t } from "i18next";
import {
 CaseTitleCell,
TruncatedOptionsCell,
TruncatedGroupOptionsCell,
 ParticipantsCell,
 StatusCell,
 LinkCell,
Expand DownExpand Up@@ -82,15 +82,37 @@ export const taskColumn = () => ({
 resizable: true,
 width: 200,
 cellRenderer: () => ({
 component: TruncatedOptionsCell,
 component: TruncatedGroupOptionsCell,
 params: {
 href: (option) => `/tasks/${option.id}/edit`,
 formatterOptions: (option, row, column, columns) => option.name,
filterData: (row, column, columns) => {
formatData: (row, column, columns) => {
 if (row.case_status === "COMPLETED") {
 return [];
 }
 return row.tasks.filter((el) => el.status === "ACTIVE");

 const groupedTasks = row.tasks.reduce((acc, task) => {
 if (task.status !== "ACTIVE") {
 return acc;
 }

 const processId = task.process_id;
 const existGroup = acc.find((group) => group.process_id === processId);

 if (existGroup) {
 existGroup.options.push(task);
 } else {
 acc.push({
 process_id: processId,
 options: [task],
 ...row.processes.find((process) => process.id === processId),
 });
 }

 return acc;
 }, []);

 return groupedTasks;
 },
 },
 }),
Expand Down

2 changes: 2 additions & 0 deletions
resources/jscomposition/system/table/cell/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import ParticipantsCell from "./ParticipantsCell.vue";
import ParticipantCell from "./ParticipantCell.vue";
import TruncatedGroupOptionsCell from "./truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue";
import TruncatedOptionsCell from "./TruncatedOptionsCell.vue";
import StatusCell from "./StatusCell.vue";
import CaseTitleCell from "./CaseTitleCell.vue";
Expand All@@ -9,6 +10,7 @@ import TruncatedColumn from "./TruncatedColumn.vue";

export {
 ParticipantsCell,
 TruncatedGroupOptionsCell,
 TruncatedOptionsCell,
 StatusCell,
 CaseTitleCell,
Expand Down

61 changes: 61 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/BaseOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
<template>
 <li class="tw-py-0 tw-px-5 tw-text-sm">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 :href="href(option)">
 {{ getValueOption(option) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer
 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden"
 @click.prevent.stop="onClickOption(option)">
 {{ getValueOption(option) }}
 </span>
 </li>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

48 changes: 48 additions & 0 deletions
resources/jscomposition/system/table/cell/truncatedGroupOptionsCell/TitleOption.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<template>
 <div
 class="tw-flex tw-px-4 tw-text-gray-400
 tw-text-xs tw-italic tw-space-x-2 tw-items-center">
 <i class="fp-play-outline tw-text-base" />
 <span class="tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">{{ getValueOption(option) }}</span>
 </div>
</template>
<script>
import { defineComponent } from "vue";

export default defineComponent({
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 option: {
 type: Object,
 default: () => ({}),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 },
 setup(props) {
 const getValueOption = (option) => {
 if (typeof props.formatterOptions === "function") {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 return {
 getValueOption,
 };
 },
});
</script>

149 changes: 149 additions & 0 deletions
...s/jscomposition/system/table/cell/truncatedGroupOptionsCell/TruncatedGroupOptionsCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>
 <div class="tw-flex tw-relative tw-text-nowrap tw-whitespace-nowrap tw-p-3">
 <div
 v-if="optionsModel.length && optionsModel[0]?.options"
 class="tw-overflow-hidden tw-text-ellipsis">
 <a
 v-if="href !== null"
 class="hover:tw-text-blue-400 tw-text-gray-500"
 :href="href(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </a>
 <span
 v-else
 class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
 href="#"
 @click.prevent.stop="onClickOption(optionsModel[0].options[0])">
 {{ getValueOption(optionsModel[0].options[0]) }}
 </span>
 </div>
 <AppPopover
 v-if="optionsModel.length"
 v-model="show"
 :hover="false"
 position="bottom"
 class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
 <div
 class="tw-flex tw-justify-center tw-items-center tw-rounded-full tw-h-4 tw-w-4 tw-border
 hover:tw-cursor-pointer hover:tw-bg-gray-100 hover:tw-border-gray-300 tw-bg-white tw-text-gray-400"
 @click.prevent="onClick">
 <i class="fas fa-ellipsis-h tw-text-[0.5rem]" />
 </div>
 <template #content>
 <ul
 class="tw-bg-white tw-list-none tw-text-gray-600 tw-py-2 tw-space-y-2 tw-flex tw-flex-col
 tw-max-w-80 tw-min-w-50
 tw-overflow-hidden tw-rounded-lg tw-text-sm tw-border tw-border-gray-300">
 <li
 v-for="(optionTitle, indexTitle) in optionsModel"
 :key="indexTitle">
 <TitleOption
 :formatter-options="formatterOptions"
 :option="optionTitle"
 :columns="columns"
 :row="row"
 :column="column" />

 <ul
 class="tw-list-disc tw-list-inside">
 <BaseOption
 v-for="(option, index) in optionTitle.options"
 :key="index"
 :formatter-options="formatterOptions"
 :option="option"
 :columns="columns"
 :row="row"
 :href="href"
 :column="column" />
 </ul>
 </li>
 </ul>
 </template>
 </AppPopover>
 </div>
</template>
<script>
import { defineComponent, ref, onMounted } from "vue";
import { isFunction } from "lodash";
import { AppPopover } from "../../../../base/index";
import TitleOption from "./TitleOption.vue";
import BaseOption from "./BaseOption.vue";

export default defineComponent({
 components: {
 AppPopover,
 TitleOption,
 BaseOption,
 },
 props: {
 columns: {
 type: Array,
 default: () => [],
 },
 column: {
 type: Object,
 default: () => ({}),
 },
 row: {
 type: Object,
 default: () => ({}),
 },
 click: {
 type: Function,
 default: new Function(),
 },
 formatterOptions: {
 type: Function,
 default: new Function(),
 },
 href: {
 type: Function,
 default: null,
 },
 // Filter Data, method to filter the input data
 formatData: {
 type: Function,
 default: null,
 },
 },
 setup(props) {
 const show = ref(false);
 const optionsModel = ref(props.row[props.column.field]);

 const getValueOption = (option) => {
 if (isFunction(props.formatterOptions)) {
 return props.formatterOptions(option, props.row, props.column, props.columns);
 }
 return "";
 };

 const onClick = () => {
 show.value = !show.value;
 };

 const onClickOption = (option, index) => {
 props.click && props.click(option, props.row, props.column, props.columns);
 };

 const onClose = () => {
 show.value = false;
 };

 onMounted(() => {
 // Filter the data before render
 if (props.formatData) {
 optionsModel.value = props.formatData(props.row, props.column, props.columns);
 }
 });

 return {
 show,
 optionsModel,
 onClose,
 onClickOption,
 onClick,
 getValueOption,
 };
 },
});
</script>