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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default defineComponent({
props: {
listId: {
type: String,
default: () => "myCases",
default: () => "",
},
},
setup(props) {
Expand Down
19 changes: 15 additions & 4 deletions resources/jscomposition/cases/casesMain/CasesMain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,32 @@ export default defineComponent({
pages.value.pop();
pages.value.push({ name: counter.header, current: true });

router.push({ path: counter.url }).catch((e) => {});
router.push({ path: counter.url }).catch((e) => { });
};

onMounted(async () => {
const initCounters = async () => {
let currentCounter = [];
const resCounters = await getCounters();

countersData.value = formatCounters(resCounters);
currentCounter = countersData.value.find((counter) => counter.url === route.path) ?? countersData.value[0];

currentCounter.active = true;
};

currentCounter = countersData.value.find((counter) => counter.url === route.path);
const initBreadcrums = () => {
const currentCounter = countersData.value.find((e) => e.active) ?? countersData.value[0];
pages.value = [
configHomeBreadcrum(),
{ name: "Cases", href: "/cases", current: false },
];
currentCounter = currentCounter ?? countersData.value.find((counter) => counter.url.includes("/my-cases"));

pages.value.push({ name: currentCounter.header, current: true });
};

onMounted(async () => {
await initCounters();
initBreadcrums();
});

return {
Expand Down
16 changes: 8 additions & 8 deletions resources/jscomposition/cases/casesMain/config/columns.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const caseNumberColumn = () => ({
component: LinkCell,
params: {
click: (row, column, columns) => {
window.document.location = `cases/${row.case_number}`;
window.document.location = `/cases/${row.case_number}`;
},
},
}),
Expand All @@ -82,7 +82,7 @@ export const caseTitleColumn = () => ({
component: CaseTitleCell,
params: {
click: (row, column, columns) => {
window.document.location = `cases/${row.case_number}`;
window.document.location = `/cases/${row.case_number}`;
},
},
}),
Expand Down Expand Up @@ -119,7 +119,7 @@ export const taskColumn = () => ({
component: TruncatedOptionsCell,
params: {
click: (option, row, column, columns) => {
window.document.location = `tasks/${option.id}/edit`;
window.document.location = `/tasks/${option.id}/edit`;
},
},
}),
Expand All @@ -138,7 +138,7 @@ export const participantsColumn = () => ({
component: ParticipantsCell,
params: {
click: (option, row, column, columns) => {
window.document.location = `profile/${option.id}`;
window.document.location = `/profile/${option.id}`;
},
},
}),
Expand Down Expand Up @@ -188,7 +188,7 @@ export const completedColumn = () => ({

export const getColumns = (type) => {
const columnsDefinition = {
"my-cases": [
default: [
caseNumberColumn(),
caseTitleColumn(),
processColumn(),
Expand All @@ -198,7 +198,7 @@ export const getColumns = (type) => {
startedColumn(),
completedColumn(),
],
"in-progress": [
in_progress: [
caseNumberColumn(),
caseTitleColumn(),
processColumn(),
Expand All @@ -217,7 +217,7 @@ export const getColumns = (type) => {
startedColumn(),
completedColumn(),
],
"all-cases": [
all: [
caseNumberColumn(),
caseTitleColumn(),
processColumn(),
Expand All @@ -229,5 +229,5 @@ export const getColumns = (type) => {
],
};

return columnsDefinition[type] || columnsDefinition.myCases;
return columnsDefinition[type] || columnsDefinition.default;
};
4 changes: 2 additions & 2 deletions resources/jscomposition/cases/casesMain/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default {};
export const routes = [
{
name: "cases",
path: "/cases-main",
path: "/cases",
component: CasesMain,
props(route) {
return {};
Expand All @@ -18,7 +18,7 @@ export const routes = [
component: CasesDataSection,
props(route) {
return {
listId: route.params?.id || "my-cases",
listId: route.params?.id || "",
};
},
},
Expand Down
46 changes: 0 additions & 46 deletions resources/jscomposition/cases/casesMain/system/Breadcrums.vue

This file was deleted.

7 changes: 0 additions & 7 deletions resources/jscomposition/cases/casesMain/system/index.js

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading