FOUR-20639: S7: Add a Reset Table in the modal#7928

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 4 commits into from
Jan 24, 2025
Merged

FOUR-20639: S7: Add a Reset Table in the modal #7928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19832ba
FOUR-20639: S7: Add a Reset Table in the modal
hjonathan Jan 23, 2025
65eae70
FOUR-20639: S7: Add a Reset Table in the modal
hjonathan Jan 24, 2025
0920560
FOUR-20639: S7: Add a Reset Table in the modal
hjonathan Jan 24, 2025
6be1a52
FOUR-20639: S7: Add a Reset Table in the modal
hjonathan Jan 24, 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
28 changes: 26 additions & 2 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
<CaseFilter @enter="onChangeSearch" />
<BadgesSection
v-model="badgesData"
@remove="onRemoveBadge" />
@remove="onRemoveBadge">
<template #endsection>
<div
id="reset-table-btn"
class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.
tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
@click="onResetTable">
<i class="fas fa-reply" />
<span>{{ $t("Reset Table") }}</span>
</div>
</template>
</BadgesSection>
<FilterableTable
ref="table"
:columns="columnsConfig"
:data="data"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter">
@changeFilter="onChangeFilter"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
:placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
await hookGetData();
};

const onResetTable = async () => {
filters.value = [];
badgesData.value = [];
dataPagination.value.page = 1; // Reset page to 1
saveFilters(filters.value);

table.value.removeAllFilters();
await hookGetData();
};

onMounted(async () => {
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
table.value.addFilters(filtersSaved);
hookGetData();
});

Expand Down
45 changes: 25 additions & 20 deletions resources/jscomposition/cases/casesMain/components/BadgesSection.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
<transition-group
name="badge"
tag="div"
class="tw-flex tw-space-x-1">
<Badge
v-for="(item, index) in data"
:key="item.fieldName"
:id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
class="tw-text-xs tw-bg-gray-100"
color="gray">
<span>
<span class=" tw-font-bold"> {{ item.fieldName }} </span>
<span> {{ item.operator }} </span>
<span> {{ item.value }} </span>
<div class="tw-flex tw-justify-between">
<transition-group
name="badge"
tag="div"
class="tw-flex tw-space-x-1">
<Badge
v-for="(item, index) in data"
:id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
:key="item.fieldName"
class="tw-text-xs tw-bg-gray-100"
color="gray">
<span>
<span class=" tw-font-bold"> {{ item.fieldName }} </span>
<span> {{ item.operator }} </span>
<span> {{ item.value }} </span>

<i
class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
@click="onClose(item, index)" />
</span>
</Badge>
</transition-group>
<i
class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
@click="onClose(item, index)" />
</span>
</Badge>
</transition-group>
<slot
v-if="data.length"
name="endsection" />
</div>
</template>
<script setup>
import { computed } from "vue";
Expand Down
14 changes: 14 additions & 0 deletions resources/jscomposition/cases/casesMain/config/columns.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
filter: {
dataType: "string",
operators: ["=", ">", ">=", "in", "between"],
resetTable: true,
},
cellRenderer: () => ({
component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
filter: {
dataType: "string",
operators: ["=", ">", ">=", "in", "between"],
resetTable: true,
},
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
header: "Process",
resizable: true,
width: 200,
filter: {
resetTable: true,
},
cellRenderer: () => ({
component: TruncatedColumn,
params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
header: t("Current Task"),
resizable: true,
width: 200,
filter: {
resetTable: true,
},
cellRenderer: () => ({
component: TruncatedGroupOptionsCell,
params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
header: "Participants",
resizable: true,
width: 200,
filter: {
resetTable: true,
},
cellRenderer: () => ({
component: ParticipantsCell,
params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
filter: {
dataType: "enum",
operators: ["="],
resetTable: true,
config: {
options: [{
label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
filter: {
dataType: "datetime",
operators: ["between", ">", ">=", "<", "<="],
resetTable: true,
},
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
filter: {
dataType: "datetime",
operators: ["between", ">", ">=", "<", "<="],
resetTable: true,
},
});

Expand Down
19 changes: 18 additions & 1 deletion resources/jscomposition/system/table/FilterableTable.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
:filter="column.filter"
:value="getFilter(index, column)"
@change="e=> onChangeFilter(column, e, index)"
@clear="e=> onClear(column, e, index)" />
@clear="e=> onClear(column, e, index)"
@resetTable="e=> onResetTable()" />
</template>
<template #placeholder>
<slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
emit("changeFilter", filters.value);
};

const onResetTable = () => {
filters.value = [];

emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
filters.value.splice(index, 1);
};

const removeAllFilters = () => {
filters.value = [];
};

const addFilters = (filtersValue) => {
filters.value = filtersValue;
};

const getFilter = (index, column) => {
const filter = filters.value.find((e) => e.field === column.field);
return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
removeFilter,
removeAllFilters,
addFilters,
});
</script>
65 changes: 45 additions & 20 deletions resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

<template #content>
<div
class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
<SortingButtons
@asc="onAsc"
@desc="onDesc" />

<div class="tw-grow tw-overflow-auto tw-space-y-4">
<FilterOperator
:key="key"
ref="filterOperatorsRef"
:value="filterOperator"
:operators="filter.operators"
:type="filter.dataType"
:config="filter.config"
@change="(e) => onChangeFilterOperator(e)" />
class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
<div
v-if="filter.operators"
class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
<SortingButtons
@asc="onAsc"
@desc="onDesc" />

<div class="tw-grow tw-overflow-auto tw-space-y-4">
<FilterOperator
:key="key"
ref="filterOperatorsRef"
:value="filterOperator"
:operators="filter.operators"
:type="filter.dataType"
:config="filter.config"
@change="(e) => onChangeFilterOperator(e)" />
</div>

<FooterButtons
@cancel="onCancel"
@clear="onClear"
@apply="onApply" />
</div>
<div
Comment thread
henryjonathanquispe marked this conversation as resolved.
v-if="filter.resetTable"
:class="{
'tw-border-t': filter.operators,
}"
class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
<div
id="reset-table-btn"
class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
@click="onResetTable">
<i class="fas fa-reply" />
<span>{{ $t("Reset Table") }}</span>
</div>
</div>

<FooterButtons
@cancel="onCancel"
@clear="onClear"
@apply="onApply" />
</div>
</template>
</AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
show.value = false;
};

const onResetTable = () => {
emit("resetTable");

show.value = false;
};

const onChangeFilterOperator = (element) => {
filterOperator.value = element;
};
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
"Reset Translations": "Reset Translations",
"Reset Your Password": "Reset Your Password",
"Reset": "Reset",
"Reset Table": "Reset Table",
"Resource": "Resource",
"Resources": "Resources",
"Response Body": "Response Body",
Expand Down
1 change: 1 addition & 0 deletions resources/lang/es.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
"Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
"When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
"Reset": "Restablecer",
"Reset Table": "Restablecer tabla",
"Reset to initial scale": "Restablecer a escala inicial",
"Restore": "Restaurar",
"Rich Text Content": "Contenido de texto enriquecido",
Expand Down
, '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-20639: S7: Add a Reset Table in the modal#7928

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

from

Jan 24, 2025
 Merged


FOUR-20639: S7: Add a Reset Table in the modal
#7928
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
19832ba

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 23, 2025
65eae70

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
0920560

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
6be1a52

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 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


28 changes: 26 additions & 2 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge" />
 @remove="onRemoveBadge">
 <template #endsection>
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.

 tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </template>
 </BadgesSection>
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter">
 @changeFilter="onChangeFilter"
 @resetFilters="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
 await hookGetData();
};

const onResetTable = async () => {
 filters.value = [];
 badgesData.value = [];
 dataPagination.value.page = 1; // Reset page to 1
 saveFilters(filters.value);

 table.value.removeAllFilters();
 await hookGetData();
};

onMounted(async () => {
 getFilters().then((response) => {
 const filtersSaved = formatFilterSaved(response.data.filters);
 filters.value = filtersSaved;
 badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
 table.value.addFilters(filtersSaved);
 hookGetData();
 });

Expand Down

45 changes: 25 additions & 20 deletions
resources/jscomposition/cases/casesMain/components/BadgesSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :key="item.fieldName"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>
 <div class="tw-flex tw-justify-between">
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 :key="item.fieldName"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>

 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <slot
 v-if="data.length"
 name="endsection" />
 </div>
</template>
<script setup>
import { computed } from "vue";
Expand Down

14 changes: 14 additions & 0 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
 cellRenderer: () => ({
 component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
 header: "Process",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedColumn,
 params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
 header: t("Current Task"),
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedGroupOptionsCell,
 params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
 header: "Participants",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: ParticipantsCell,
 params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
 filter: {
 dataType: "enum",
 operators: ["="],
 resetTable: true,
 config: {
 options: [{
 label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand Down

19 changes: 18 additions & 1 deletion
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
 :filter="column.filter"
 :value="getFilter(index, column)"
 @change="e=> onChangeFilter(column, e, index)"
 @clear="e=> onClear(column, e, index)" />
 @clear="e=> onClear(column, e, index)"
 @resetTable="e=> onResetTable()" />
 </template>
 <template #placeholder>
 <slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
 emit("changeFilter", filters.value);
};

const onResetTable = () => {
 filters.value = [];

 emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
 filters.value.splice(index, 1);
};

const removeAllFilters = () => {
 filters.value = [];
};

const addFilters = (filtersValue) => {
 filters.value = filtersValue;
};

const getFilter = (index, column) => {
 const filter = filters.value.find((e) => e.field === column.field);
 return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
 removeFilter,
 removeAllFilters,
 addFilters,
});
</script>

65 changes: 45 additions & 20 deletions
resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

 <template #content>
 <div
 class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <div
 v-if="filter.operators"
 class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 <div
Comment thread
henryjonathanquispe marked this conversation as resolved.

 v-if="filter.resetTable"
 :class="{
 'tw-border-t': filter.operators,
 }"
 class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 </template>
 </AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
 show.value = false;
};

const onResetTable = () => {
 emit("resetTable");

 show.value = false;
};

const onChangeFilterOperator = (element) => {
 filterOperator.value = element;
};
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/en.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
 "Reset Translations": "Reset Translations",
 "Reset Your Password": "Reset Your Password",
 "Reset": "Reset",
 "Reset Table": "Reset Table",
 "Resource": "Resource",
 "Resources": "Resources",
 "Response Body": "Response Body",
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/es.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
 "Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
 "When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
 "Reset": "Restablecer",
 "Reset Table": "Restablecer tabla",
 "Reset to initial scale": "Restablecer a escala inicial",
 "Restore": "Restaurar",
 "Rich Text Content": "Contenido de texto enriquecido",
Expand Down

, '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-20639: S7: Add a Reset Table in the modal#7928

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

from

Jan 24, 2025
 Merged


FOUR-20639: S7: Add a Reset Table in the modal
#7928
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
19832ba

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 23, 2025
65eae70

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
0920560

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
6be1a52

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 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


28 changes: 26 additions & 2 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge" />
 @remove="onRemoveBadge">
 <template #endsection>
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.

 tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </template>
 </BadgesSection>
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter">
 @changeFilter="onChangeFilter"
 @resetFilters="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
 await hookGetData();
};

const onResetTable = async () => {
 filters.value = [];
 badgesData.value = [];
 dataPagination.value.page = 1; // Reset page to 1
 saveFilters(filters.value);

 table.value.removeAllFilters();
 await hookGetData();
};

onMounted(async () => {
 getFilters().then((response) => {
 const filtersSaved = formatFilterSaved(response.data.filters);
 filters.value = filtersSaved;
 badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
 table.value.addFilters(filtersSaved);
 hookGetData();
 });

Expand Down

45 changes: 25 additions & 20 deletions
resources/jscomposition/cases/casesMain/components/BadgesSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :key="item.fieldName"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>
 <div class="tw-flex tw-justify-between">
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 :key="item.fieldName"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>

 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <slot
 v-if="data.length"
 name="endsection" />
 </div>
</template>
<script setup>
import { computed } from "vue";
Expand Down

14 changes: 14 additions & 0 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
 cellRenderer: () => ({
 component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
 header: "Process",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedColumn,
 params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
 header: t("Current Task"),
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedGroupOptionsCell,
 params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
 header: "Participants",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: ParticipantsCell,
 params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
 filter: {
 dataType: "enum",
 operators: ["="],
 resetTable: true,
 config: {
 options: [{
 label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand Down

19 changes: 18 additions & 1 deletion
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
 :filter="column.filter"
 :value="getFilter(index, column)"
 @change="e=> onChangeFilter(column, e, index)"
 @clear="e=> onClear(column, e, index)" />
 @clear="e=> onClear(column, e, index)"
 @resetTable="e=> onResetTable()" />
 </template>
 <template #placeholder>
 <slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
 emit("changeFilter", filters.value);
};

const onResetTable = () => {
 filters.value = [];

 emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
 filters.value.splice(index, 1);
};

const removeAllFilters = () => {
 filters.value = [];
};

const addFilters = (filtersValue) => {
 filters.value = filtersValue;
};

const getFilter = (index, column) => {
 const filter = filters.value.find((e) => e.field === column.field);
 return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
 removeFilter,
 removeAllFilters,
 addFilters,
});
</script>

65 changes: 45 additions & 20 deletions
resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

 <template #content>
 <div
 class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <div
 v-if="filter.operators"
 class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 <div
Comment thread
henryjonathanquispe marked this conversation as resolved.

 v-if="filter.resetTable"
 :class="{
 'tw-border-t': filter.operators,
 }"
 class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 </template>
 </AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
 show.value = false;
};

const onResetTable = () => {
 emit("resetTable");

 show.value = false;
};

const onChangeFilterOperator = (element) => {
 filterOperator.value = element;
};
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/en.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
 "Reset Translations": "Reset Translations",
 "Reset Your Password": "Reset Your Password",
 "Reset": "Reset",
 "Reset Table": "Reset Table",
 "Resource": "Resource",
 "Resources": "Resources",
 "Response Body": "Response Body",
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/es.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
 "Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
 "When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
 "Reset": "Restablecer",
 "Reset Table": "Restablecer tabla",
 "Reset to initial scale": "Restablecer a escala inicial",
 "Restore": "Restaurar",
 "Rich Text Content": "Contenido de texto enriquecido",
Expand Down

, '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-20639: S7: Add a Reset Table in the modal#7928

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

from

Jan 24, 2025
 Merged


FOUR-20639: S7: Add a Reset Table in the modal
#7928
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
19832ba

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 23, 2025
65eae70

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
0920560

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
6be1a52

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 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


28 changes: 26 additions & 2 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge" />
 @remove="onRemoveBadge">
 <template #endsection>
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.

 tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </template>
 </BadgesSection>
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter">
 @changeFilter="onChangeFilter"
 @resetFilters="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
 await hookGetData();
};

const onResetTable = async () => {
 filters.value = [];
 badgesData.value = [];
 dataPagination.value.page = 1; // Reset page to 1
 saveFilters(filters.value);

 table.value.removeAllFilters();
 await hookGetData();
};

onMounted(async () => {
 getFilters().then((response) => {
 const filtersSaved = formatFilterSaved(response.data.filters);
 filters.value = filtersSaved;
 badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
 table.value.addFilters(filtersSaved);
 hookGetData();
 });

Expand Down

45 changes: 25 additions & 20 deletions
resources/jscomposition/cases/casesMain/components/BadgesSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :key="item.fieldName"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>
 <div class="tw-flex tw-justify-between">
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 :key="item.fieldName"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>

 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <slot
 v-if="data.length"
 name="endsection" />
 </div>
</template>
<script setup>
import { computed } from "vue";
Expand Down

14 changes: 14 additions & 0 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
 cellRenderer: () => ({
 component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
 header: "Process",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedColumn,
 params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
 header: t("Current Task"),
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedGroupOptionsCell,
 params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
 header: "Participants",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: ParticipantsCell,
 params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
 filter: {
 dataType: "enum",
 operators: ["="],
 resetTable: true,
 config: {
 options: [{
 label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand Down

19 changes: 18 additions & 1 deletion
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
 :filter="column.filter"
 :value="getFilter(index, column)"
 @change="e=> onChangeFilter(column, e, index)"
 @clear="e=> onClear(column, e, index)" />
 @clear="e=> onClear(column, e, index)"
 @resetTable="e=> onResetTable()" />
 </template>
 <template #placeholder>
 <slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
 emit("changeFilter", filters.value);
};

const onResetTable = () => {
 filters.value = [];

 emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
 filters.value.splice(index, 1);
};

const removeAllFilters = () => {
 filters.value = [];
};

const addFilters = (filtersValue) => {
 filters.value = filtersValue;
};

const getFilter = (index, column) => {
 const filter = filters.value.find((e) => e.field === column.field);
 return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
 removeFilter,
 removeAllFilters,
 addFilters,
});
</script>

65 changes: 45 additions & 20 deletions
resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

 <template #content>
 <div
 class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <div
 v-if="filter.operators"
 class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 <div
Comment thread
henryjonathanquispe marked this conversation as resolved.

 v-if="filter.resetTable"
 :class="{
 'tw-border-t': filter.operators,
 }"
 class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 </template>
 </AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
 show.value = false;
};

const onResetTable = () => {
 emit("resetTable");

 show.value = false;
};

const onChangeFilterOperator = (element) => {
 filterOperator.value = element;
};
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/en.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
 "Reset Translations": "Reset Translations",
 "Reset Your Password": "Reset Your Password",
 "Reset": "Reset",
 "Reset Table": "Reset Table",
 "Resource": "Resource",
 "Resources": "Resources",
 "Response Body": "Response Body",
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/es.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
 "Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
 "When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
 "Reset": "Restablecer",
 "Reset Table": "Restablecer tabla",
 "Reset to initial scale": "Restablecer a escala inicial",
 "Restore": "Restaurar",
 "Rich Text Content": "Contenido de texto enriquecido",
Expand Down

, '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-20639: S7: Add a Reset Table in the modal#7928

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

from

Jan 24, 2025
 Merged


FOUR-20639: S7: Add a Reset Table in the modal
#7928
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
19832ba

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 23, 2025
65eae70

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
0920560

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
6be1a52

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 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


28 changes: 26 additions & 2 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge" />
 @remove="onRemoveBadge">
 <template #endsection>
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.

 tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </template>
 </BadgesSection>
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter">
 @changeFilter="onChangeFilter"
 @resetFilters="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
 await hookGetData();
};

const onResetTable = async () => {
 filters.value = [];
 badgesData.value = [];
 dataPagination.value.page = 1; // Reset page to 1
 saveFilters(filters.value);

 table.value.removeAllFilters();
 await hookGetData();
};

onMounted(async () => {
 getFilters().then((response) => {
 const filtersSaved = formatFilterSaved(response.data.filters);
 filters.value = filtersSaved;
 badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
 table.value.addFilters(filtersSaved);
 hookGetData();
 });

Expand Down

45 changes: 25 additions & 20 deletions
resources/jscomposition/cases/casesMain/components/BadgesSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :key="item.fieldName"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>
 <div class="tw-flex tw-justify-between">
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 :key="item.fieldName"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>

 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <slot
 v-if="data.length"
 name="endsection" />
 </div>
</template>
<script setup>
import { computed } from "vue";
Expand Down

14 changes: 14 additions & 0 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
 cellRenderer: () => ({
 component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
 header: "Process",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedColumn,
 params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
 header: t("Current Task"),
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedGroupOptionsCell,
 params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
 header: "Participants",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: ParticipantsCell,
 params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
 filter: {
 dataType: "enum",
 operators: ["="],
 resetTable: true,
 config: {
 options: [{
 label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand Down

19 changes: 18 additions & 1 deletion
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
 :filter="column.filter"
 :value="getFilter(index, column)"
 @change="e=> onChangeFilter(column, e, index)"
 @clear="e=> onClear(column, e, index)" />
 @clear="e=> onClear(column, e, index)"
 @resetTable="e=> onResetTable()" />
 </template>
 <template #placeholder>
 <slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
 emit("changeFilter", filters.value);
};

const onResetTable = () => {
 filters.value = [];

 emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
 filters.value.splice(index, 1);
};

const removeAllFilters = () => {
 filters.value = [];
};

const addFilters = (filtersValue) => {
 filters.value = filtersValue;
};

const getFilter = (index, column) => {
 const filter = filters.value.find((e) => e.field === column.field);
 return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
 removeFilter,
 removeAllFilters,
 addFilters,
});
</script>

65 changes: 45 additions & 20 deletions
resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

 <template #content>
 <div
 class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <div
 v-if="filter.operators"
 class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 <div
Comment thread
henryjonathanquispe marked this conversation as resolved.

 v-if="filter.resetTable"
 :class="{
 'tw-border-t': filter.operators,
 }"
 class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 </template>
 </AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
 show.value = false;
};

const onResetTable = () => {
 emit("resetTable");

 show.value = false;
};

const onChangeFilterOperator = (element) => {
 filterOperator.value = element;
};
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/en.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
 "Reset Translations": "Reset Translations",
 "Reset Your Password": "Reset Your Password",
 "Reset": "Reset",
 "Reset Table": "Reset Table",
 "Resource": "Resource",
 "Resources": "Resources",
 "Response Body": "Response Body",
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/es.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
 "Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
 "When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
 "Reset": "Restablecer",
 "Reset Table": "Restablecer tabla",
 "Reset to initial scale": "Restablecer a escala inicial",
 "Restore": "Restaurar",
 "Rich Text Content": "Contenido de texto enriquecido",
Expand Down

, '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-20639: S7: Add a Reset Table in the modal#7928

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

from

Jan 24, 2025
 Merged


FOUR-20639: S7: Add a Reset Table in the modal
#7928
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
19832ba

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 23, 2025
65eae70

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
0920560

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
6be1a52

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 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


28 changes: 26 additions & 2 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge" />
 @remove="onRemoveBadge">
 <template #endsection>
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.

 tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </template>
 </BadgesSection>
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter">
 @changeFilter="onChangeFilter"
 @resetFilters="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
 await hookGetData();
};

const onResetTable = async () => {
 filters.value = [];
 badgesData.value = [];
 dataPagination.value.page = 1; // Reset page to 1
 saveFilters(filters.value);

 table.value.removeAllFilters();
 await hookGetData();
};

onMounted(async () => {
 getFilters().then((response) => {
 const filtersSaved = formatFilterSaved(response.data.filters);
 filters.value = filtersSaved;
 badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
 table.value.addFilters(filtersSaved);
 hookGetData();
 });

Expand Down

45 changes: 25 additions & 20 deletions
resources/jscomposition/cases/casesMain/components/BadgesSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :key="item.fieldName"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>
 <div class="tw-flex tw-justify-between">
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 :key="item.fieldName"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>

 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <slot
 v-if="data.length"
 name="endsection" />
 </div>
</template>
<script setup>
import { computed } from "vue";
Expand Down

14 changes: 14 additions & 0 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
 cellRenderer: () => ({
 component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
 header: "Process",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedColumn,
 params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
 header: t("Current Task"),
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedGroupOptionsCell,
 params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
 header: "Participants",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: ParticipantsCell,
 params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
 filter: {
 dataType: "enum",
 operators: ["="],
 resetTable: true,
 config: {
 options: [{
 label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand Down

19 changes: 18 additions & 1 deletion
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
 :filter="column.filter"
 :value="getFilter(index, column)"
 @change="e=> onChangeFilter(column, e, index)"
 @clear="e=> onClear(column, e, index)" />
 @clear="e=> onClear(column, e, index)"
 @resetTable="e=> onResetTable()" />
 </template>
 <template #placeholder>
 <slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
 emit("changeFilter", filters.value);
};

const onResetTable = () => {
 filters.value = [];

 emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
 filters.value.splice(index, 1);
};

const removeAllFilters = () => {
 filters.value = [];
};

const addFilters = (filtersValue) => {
 filters.value = filtersValue;
};

const getFilter = (index, column) => {
 const filter = filters.value.find((e) => e.field === column.field);
 return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
 removeFilter,
 removeAllFilters,
 addFilters,
});
</script>

65 changes: 45 additions & 20 deletions
resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

 <template #content>
 <div
 class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <div
 v-if="filter.operators"
 class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 <div
Comment thread
henryjonathanquispe marked this conversation as resolved.

 v-if="filter.resetTable"
 :class="{
 'tw-border-t': filter.operators,
 }"
 class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 </template>
 </AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
 show.value = false;
};

const onResetTable = () => {
 emit("resetTable");

 show.value = false;
};

const onChangeFilterOperator = (element) => {
 filterOperator.value = element;
};
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/en.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
 "Reset Translations": "Reset Translations",
 "Reset Your Password": "Reset Your Password",
 "Reset": "Reset",
 "Reset Table": "Reset Table",
 "Resource": "Resource",
 "Resources": "Resources",
 "Response Body": "Response Body",
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/es.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
 "Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
 "When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
 "Reset": "Restablecer",
 "Reset Table": "Restablecer tabla",
 "Reset to initial scale": "Restablecer a escala inicial",
 "Restore": "Restaurar",
 "Rich Text Content": "Contenido de texto enriquecido",
Expand Down

, '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-20639: S7: Add a Reset Table in the modal#7928

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

from

Jan 24, 2025
 Merged


FOUR-20639: S7: Add a Reset Table in the modal
#7928
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
19832ba

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 23, 2025
65eae70

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
0920560

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
6be1a52

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 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


28 changes: 26 additions & 2 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge" />
 @remove="onRemoveBadge">
 <template #endsection>
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.

 tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </template>
 </BadgesSection>
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter">
 @changeFilter="onChangeFilter"
 @resetFilters="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
 await hookGetData();
};

const onResetTable = async () => {
 filters.value = [];
 badgesData.value = [];
 dataPagination.value.page = 1; // Reset page to 1
 saveFilters(filters.value);

 table.value.removeAllFilters();
 await hookGetData();
};

onMounted(async () => {
 getFilters().then((response) => {
 const filtersSaved = formatFilterSaved(response.data.filters);
 filters.value = filtersSaved;
 badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
 table.value.addFilters(filtersSaved);
 hookGetData();
 });

Expand Down

45 changes: 25 additions & 20 deletions
resources/jscomposition/cases/casesMain/components/BadgesSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :key="item.fieldName"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>
 <div class="tw-flex tw-justify-between">
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 :key="item.fieldName"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>

 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <slot
 v-if="data.length"
 name="endsection" />
 </div>
</template>
<script setup>
import { computed } from "vue";
Expand Down

14 changes: 14 additions & 0 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
 cellRenderer: () => ({
 component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
 header: "Process",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedColumn,
 params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
 header: t("Current Task"),
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedGroupOptionsCell,
 params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
 header: "Participants",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: ParticipantsCell,
 params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
 filter: {
 dataType: "enum",
 operators: ["="],
 resetTable: true,
 config: {
 options: [{
 label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand Down

19 changes: 18 additions & 1 deletion
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
 :filter="column.filter"
 :value="getFilter(index, column)"
 @change="e=> onChangeFilter(column, e, index)"
 @clear="e=> onClear(column, e, index)" />
 @clear="e=> onClear(column, e, index)"
 @resetTable="e=> onResetTable()" />
 </template>
 <template #placeholder>
 <slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
 emit("changeFilter", filters.value);
};

const onResetTable = () => {
 filters.value = [];

 emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
 filters.value.splice(index, 1);
};

const removeAllFilters = () => {
 filters.value = [];
};

const addFilters = (filtersValue) => {
 filters.value = filtersValue;
};

const getFilter = (index, column) => {
 const filter = filters.value.find((e) => e.field === column.field);
 return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
 removeFilter,
 removeAllFilters,
 addFilters,
});
</script>

65 changes: 45 additions & 20 deletions
resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

 <template #content>
 <div
 class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <div
 v-if="filter.operators"
 class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 <div
Comment thread
henryjonathanquispe marked this conversation as resolved.

 v-if="filter.resetTable"
 :class="{
 'tw-border-t': filter.operators,
 }"
 class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 </template>
 </AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
 show.value = false;
};

const onResetTable = () => {
 emit("resetTable");

 show.value = false;
};

const onChangeFilterOperator = (element) => {
 filterOperator.value = element;
};
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/en.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
 "Reset Translations": "Reset Translations",
 "Reset Your Password": "Reset Your Password",
 "Reset": "Reset",
 "Reset Table": "Reset Table",
 "Resource": "Resource",
 "Resources": "Resources",
 "Response Body": "Response Body",
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/es.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
 "Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
 "When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
 "Reset": "Restablecer",
 "Reset Table": "Restablecer tabla",
 "Reset to initial scale": "Restablecer a escala inicial",
 "Restore": "Restaurar",
 "Rich Text Content": "Contenido de texto enriquecido",
Expand Down

, '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-20639: S7: Add a Reset Table in the modal#7928

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

from

Jan 24, 2025
 Merged


FOUR-20639: S7: Add a Reset Table in the modal
#7928
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
19832ba

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 23, 2025
65eae70

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
0920560

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 2025
6be1a52

FOUR-20639: S7: Add a Reset Table in the modal


hjonathan Jan 24, 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


28 changes: 26 additions & 2 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,26 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge" />
 @remove="onRemoveBadge">
 <template #endsection>
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
Comment thread
henryjonathanquispe marked this conversation as resolved.

 tw-text-xs tw-border-l tw-border-gray-300 tw-pl-2
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </template>
 </BadgesSection>
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter">
 @changeFilter="onChangeFilter"
 @resetFilters="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand DownExpand Up@@ -160,11 +173,22 @@ const onRemoveBadge = async (badge, index) => {
 await hookGetData();
};

const onResetTable = async () => {
 filters.value = [];
 badgesData.value = [];
 dataPagination.value.page = 1; // Reset page to 1
 saveFilters(filters.value);

 table.value.removeAllFilters();
 await hookGetData();
};

onMounted(async () => {
 getFilters().then((response) => {
 const filtersSaved = formatFilterSaved(response.data.filters);
 filters.value = filtersSaved;
 badgesData.value = formatFilterBadges(filtersSaved, columnsConfig.value);
 table.value.addFilters(filtersSaved);
 hookGetData();
 });

Expand Down

45 changes: 25 additions & 20 deletions
resources/jscomposition/cases/casesMain/components/BadgesSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
<template>
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :key="item.fieldName"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>
 <div class="tw-flex tw-justify-between">
 <transition-group
 name="badge"
 tag="div"
 class="tw-flex tw-space-x-1">
 <Badge
 v-for="(item, index) in data"
 :id="`badge-${item.fieldName.replace(/\s+/g, '-')}`"
 :key="item.fieldName"
 class="tw-text-xs tw-bg-gray-100"
 color="gray">
 <span>
 <span class=" tw-font-bold"> {{ item.fieldName }} </span>
 <span> {{ item.operator }} </span>
 <span> {{ item.value }} </span>

 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <i
 class="fas fa-times tw-pl-1 hover:tw-cursor-pointer"
 @click="onClose(item, index)" />
 </span>
 </Badge>
 </transition-group>
 <slot
 v-if="data.length"
 name="endsection" />
 </div>
</template>
<script setup>
import { computed } from "vue";
Expand Down

14 changes: 14 additions & 0 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ export const caseNumberColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
 cellRenderer: () => ({
 component: LinkCell,
Expand All@@ -60,6 +61,7 @@ export const caseTitleColumn = () => ({
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
 resetTable: true,
 },
});

Expand All@@ -68,6 +70,9 @@ export const processColumn = () => ({
 header: "Process",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedColumn,
 params: {
Expand All@@ -81,6 +86,9 @@ export const taskColumn = () => ({
 header: t("Current Task"),
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: TruncatedGroupOptionsCell,
 params: {
Expand DownExpand Up@@ -123,6 +131,9 @@ export const participantsColumn = () => ({
 header: "Participants",
 resizable: true,
 width: 200,
 filter: {
 resetTable: true,
 },
 cellRenderer: () => ({
 component: ParticipantsCell,
 params: {
Expand All@@ -147,6 +158,7 @@ export const statusColumn = () => ({
 filter: {
 dataType: "enum",
 operators: ["="],
 resetTable: true,
 config: {
 options: [{
 label: t("In progress"),
Expand DownExpand Up@@ -177,6 +189,7 @@ export const startedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand All@@ -189,6 +202,7 @@ export const completedColumn = () => ({
 filter: {
 dataType: "datetime",
 operators: ["between", ">", ">=", "<", "<="],
 resetTable: true,
 },
});

Expand Down

19 changes: 18 additions & 1 deletion
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
 :filter="column.filter"
 :value="getFilter(index, column)"
 @change="e=> onChangeFilter(column, e, index)"
 @clear="e=> onClear(column, e, index)" />
 @clear="e=> onClear(column, e, index)"
 @resetTable="e=> onResetTable()" />
 </template>
 <template #placeholder>
 <slot name="placeholder" />
Expand DownExpand Up@@ -81,10 +82,24 @@ const onClear = (column, val, index) => {
 emit("changeFilter", filters.value);
};

const onResetTable = () => {
 filters.value = [];

 emit("resetFilters", filters.value);
};

const removeFilter = (index) => {
 filters.value.splice(index, 1);
};

const removeAllFilters = () => {
 filters.value = [];
};

const addFilters = (filtersValue) => {
 filters.value = filtersValue;
};

const getFilter = (index, column) => {
 const filter = filters.value.find((e) => e.field === column.field);
 return filter || null;
Expand All@@ -97,5 +112,7 @@ const hasFilter = (index, column) => {

defineExpose({
 removeFilter,
 removeAllFilters,
 addFilters,
});
</script>

65 changes: 45 additions & 20 deletions
resources/jscomposition/system/table/filter/defaultFilter/FilterColumn.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,27 +11,46 @@

 <template #content>
 <div
 class="tw-shadow-md tw-text-xs tw-p-4 tw-h-60 tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 class="tw-shadow-md tw-text-xs tw-space-y-2 tw-flex tw-flex-col tw-justify-between
 tw-font-normal tw-bg-white tw-text-gray-600 tw-overflow-hidden tw-rounded-lg tw-border tw-border-gray-300">
 <div
 v-if="filter.operators"
 class="tw-flex tw-flex-col tw-space-y-2 tw-px-4 tw-pt-4">
 <SortingButtons
 @asc="onAsc"
 @desc="onDesc" />

 <div class="tw-grow tw-overflow-auto tw-space-y-4">
 <FilterOperator
 :key="key"
 ref="filterOperatorsRef"
 :value="filterOperator"
 :operators="filter.operators"
 :type="filter.dataType"
 :config="filter.config"
 @change="(e) => onChangeFilterOperator(e)" />
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 <div
Comment thread
henryjonathanquispe marked this conversation as resolved.

 v-if="filter.resetTable"
 :class="{
 'tw-border-t': filter.operators,
 }"
 class="tw-flex tw-border-gray-300 tw-justify-start tw-p-4">
 <div
 id="reset-table-btn"
 class="tw-flex tw-text-gray-500 tw-space-x-2 tw-bg-transparent
 hover:tw-opacity-80 hover:tw-cursor-pointer tw-justify-center tw-items-center"
 @click="onResetTable">
 <i class="fas fa-reply" />
 <span>{{ $t("Reset Table") }}</span>
 </div>
 </div>

 <FooterButtons
 @cancel="onCancel"
 @clear="onClear"
 @apply="onApply" />
 </div>
 </template>
 </AppPopover>
Expand DownExpand Up@@ -102,6 +121,12 @@ const onClear = () => {
 show.value = false;
};

const onResetTable = () => {
 emit("resetTable");

 show.value = false;
};

const onChangeFilterOperator = (element) => {
 filterOperator.value = element;
};
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/en.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1418,6 +1418,7 @@
 "Reset Translations": "Reset Translations",
 "Reset Your Password": "Reset Your Password",
 "Reset": "Reset",
 "Reset Table": "Reset Table",
 "Resource": "Resource",
 "Resources": "Resources",
 "Response Body": "Response Body",
Expand Down

1 change: 1 addition & 0 deletions
resources/lang/es.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -685,6 +685,7 @@
 "Leave empty to continue until exit condition is satisfied": "Dejar vacío para continuar hasta que se cumpla la condición de salida",
 "When FEEL expression evaluates to true then exit loop": "Cuando la expresión FEEL se evalúe como verdadera, entonces salir del bucle",
 "Reset": "Restablecer",
 "Reset Table": "Restablecer tabla",
 "Reset to initial scale": "Restablecer a escala inicial",
 "Restore": "Restaurar",
 "Rich Text Content": "Contenido de texto enriquecido",
Expand Down