Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
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 \u003e 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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions resources/jscomposition/base/table/BaseTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@
v-for="(column, index) in columns"
:key="index"
:columns="columns"
:column="column">
:column="column"
@stopResize="onStopResize">
<slot :name="`theader-${column.field}`" />
<template #filter>
<slot :name="`theader-filter-${column.field}`" />
Expand DownExpand Up@@ -118,7 +119,7 @@ export default defineComponent({
default: () => false,
},
},
setup(props) {
setup(props, { emit }) {
const slots = useSlots();
const configRow = ref([]);
const showContainer = ref(false);
Expand All@@ -141,13 +142,18 @@ export default defineComponent({

const getShowContainer = (index) => configRow.value[index]?.showContainer;

const onStopResize = (column) => {
emit("stopResize", column);
};

return {
configRow,
showContainer,
toogleContainer,
getShowContainer,
getDefaultConfig,
slots,
onStopResize,
checkContainerRow,
checkEllipsisMenu,
tbody,
Expand Down
9 changes: 7 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed, ref } from "vue";
import { defineComponent, computed } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -38,7 +38,12 @@ export default defineComponent({
},
},
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);
const columnResize = columnResizeComposable({
column: props.column,
stopResize: () => {
emit("stopResize", props.column);
},
});

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ export default {};
* @param {*} tableName
* @returns
*/
export const columnResizeComposable = (column) => {
export const columnResizeComposable = ({ column, stopResize }) => {
const startX = ref(0);
const startWidth = ref(0);
const isResizing = ref(false);
Expand All@@ -24,11 +24,12 @@ export const columnResizeComposable = (column) => {
}
};

const stopResize = () => {
const stopResizeHandler = () => {
if (isResizing.value) {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
isResizing.value = false;
stopResize?.();
}
};

Expand All@@ -39,15 +40,16 @@ export const columnResizeComposable = (column) => {
startWidth.value = column.width || minWidth;

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
document.addEventListener("mouseup", stopResizeHandler);
};

onUnmounted(() => {
document.removeEventListener("mousemove", doResize);
document.removeEventListener("mouseup", stopResize);
document.removeEventListener("mouseup", stopResizeHandler);
});

return {
startResize,
stopResizeHandler,
};
};
14 changes: 2 additions & 12 deletions resources/jscomposition/cases/casesMain/App.vue
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
<template>
<div class="tw-flex tw-h-[90vh] ">
<RouterView></RouterView>
<RouterView />
</div>
</template>
<script>
import { defineComponent } from "vue";
<script setup>
import { RouterView } from "vue-router";

export default defineComponent({
components: {
RouterView,
},
setup() {
return {};
},
});
</script>
35 changes: 32 additions & 3 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
class="tw-text-[#4F5154]"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
@stopResize="onStopResize"
@resetFilters="onChangeFilter">
<template #placeholder>
<TablePlaceholder
Expand DownExpand Up@@ -53,10 +54,10 @@ import { useRouter, useRoute } from "vue-router/composables";
import CaseFilter from "./components/CaseFilter.vue";
import BadgesSection from "./components/BadgesSection.vue";
import { Pagination } from "../../base";
import { getColumns } from "./config/columns";
import columns, { getColumns } from "./config/columns";
import { FilterableTable, TablePlaceholder } from "../../system";
import * as api from "./api";
import { user } from "./variables";
import { user, useStore } from "./variables";
import {
formatFilters, formatFilterBadges, formattedFilter, formatFilterSaved,
} from "./utils";
Expand All@@ -79,6 +80,7 @@ const showPlaceholder = ref(false);
const placeholderType = ref("loading");
const route = useRoute();
const defaultSort = ref("case_number:desc");
const store = useStore();

const dataPagination = ref({
total: 0,
Expand DownExpand Up@@ -204,9 +206,36 @@ const autoPagination = () => {
paginator.value.setPerPage(appropriateSize);
};

const updateUserConfiguration = async () => {
const userConf = store.getters["core:cases/getUserConfiguration"];

const response = await api.updateUserConfiguration(userConf);
return response;
};

const onStopResize = (column) => {
store.commit("core:cases/updateColumnWidth", {
column: column.field,
width: column.width,
});
updateUserConfiguration();
};

const updateColumnWithUserConfiguration = (columnsDefault) => {
const casesColumns = store.getters["core:cases/getCasesColumns"];

columnsDefault.forEach((column) => {
if (casesColumns[column.field]) {
column.width = casesColumns[column.field].width;
}
});

return columnsDefault;
};

onMounted(() => {
columnsConfig.value = getColumns(props.listId);

columnsConfig.value = updateColumnWithUserConfiguration(columnsConfig.value);
getFilters().then((response) => {
const filtersSaved = formatFilterSaved(response.data.filters);
filters.value = filtersSaved;
Expand Down
12 changes: 12 additions & 0 deletions resources/jscomposition/cases/casesMain/api/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -575,3 +575,15 @@ export const getCaseFilters = async (status = "") => {

return response.data;
};

export const getUserConfiguration = async () => {
const response = await api.get("users/configuration");

return response.data;
};

export const updateUserConfiguration = async (data) => {
const response = await api.put("users/configuration", data);

return response.data;
};
28 changes: 21 additions & 7 deletions resources/jscomposition/cases/casesMain/main.js
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
import App from "./App.vue";
import { routes } from "./routes";
import { cases } from "./store";
import { getUserConfiguration } from "./api";

Vue.use(VueRouter);
Vue.globalStore.registerModule("core:cases", cases);

const router = new VueRouter({
mode: "history",
base: "/",
routes,
});

new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
const loadUserConfiguration = async () => {
const response = await getUserConfiguration();

Vue.globalStore.commit("core:cases/updateUserConfiguration", {
user_id: response.user_id,
ui_configuration: JSON.parse(response.ui_configuration),
});
};

loadUserConfiguration().then(() => {
new Vue({
el: "#cases-main",
router,
components: {
App,
},
render: (h) => h(App),
});
});
1 change: 1 addition & 0 deletions resources/jscomposition/cases/casesMain/store/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
export * from "./store";
39 changes: 39 additions & 0 deletions resources/jscomposition/cases/casesMain/store/store.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
// Store module vuex - cases
export default {};

export const cases = {
namespaced: true,
state: () => ({
userConfiguration: {},
}),
mutations: {
updateUserConfiguration: (state, config) => {
state.userConfiguration = config;
},
updateColumnWidth: (state, { column, width }) => {
if (!state.userConfiguration.ui_configuration) {
state.userConfiguration.ui_configuration = {};
}

if (!state.userConfiguration.ui_configuration.cases) {
state.userConfiguration.ui_configuration.cases = {};
}

if (!state.userConfiguration.ui_configuration.cases.columns) {
state.userConfiguration.ui_configuration.cases.columns = {};
}

state.userConfiguration.ui_configuration.cases.columns[column] = {
width,
};
},
},
getters: {
getUserConfiguration(state) {
return state.userConfiguration;
},
getCasesColumns(state) {
return state.userConfiguration.ui_configuration?.cases?.columns;
},
},
};
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesMain/variables/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@ export default {};
export const api = window.ProcessMaker?.apiClient;

export const user = currentUser;

export const useStore = () => Vue.globalStore;
9 changes: 7 additions & 2 deletions resources/jscomposition/system/table/FilterableTable.vue
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@
:data="data"
:placeholder="placeholder"
:config="config"
class="tw-grow">
class="tw-grow"
@stopResize="onStopResize">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand All@@ -29,7 +30,7 @@ import { ref } from "vue";
import { BaseTable } from "../../base";
import { FilterColumn } from "./filter/defaultFilter/index";

const emit = defineEmits(["changeFilter"]);
const emit = defineEmits(["changeFilter", "stopResize"]);

const props = defineProps({
columns: {
Expand DownExpand Up@@ -117,6 +118,10 @@ const getHeightTBody = () => baseTable.value.$el.clientHeight - baseTable.value.

const getHeightThead = () => baseTable.value.$refs.thead.clientHeight;

const onStopResize = (column) => {
emit("stopResize", column);
};

defineExpose({
removeFilter,
removeAllFilters,
Expand Down