feat(condo): DOMA-8523 added filter for expired tickets. Added saving previous query params for pages #4571

Alllex202 · 2024-04-03T17:45:40Z

Added filter for expired tickets - to filter by expired tickets that are completed, the isCompletedAfterDeadline field was added
Added saving previous query params for pages (This behavior has been updated only in condo and callcenter apps. Miniapps will be updated in another pr)
Updated filter layouts
Updated search behavior in multi-selects - now the search is not reset when selecting an item

And little demo videos

Added filter for expired tickets and saving previous query params for pages

Before

2024-04-04.15.38.00.mov

After

2024-04-04.15.35.39.mov

Updated search behavior in multi-selects

Before

2024-04-04.15.38.36.mov

After

2024-04-04.15.36.44.mov

apps/condo/domains/common/hooks/useCheckboxSearch.ts

nomerdvadcatpyat · 2024-04-04T15:05:18Z

apps/condo/domains/common/hooks/useCheckboxSearch.ts

+        }
+    }, [checkboxValueFromQuery])
+
+    return [value, handleChangeCheckbox, handleResetCheckboxWithoutUpdateQuery, handleChangeCheckboxWithoutUpdateQuery]


Maybe return a object?
It's not clear what returns from hook without read the hook code

nomerdvadcatpyat · 2024-04-04T15:06:04Z

apps/condo/domains/common/hooks/useMultipleFiltersModal.tsx

+    const reduceNonEmpty = (cnt, filter) => cnt + Number((typeof filters[filter] === 'string' || Array.isArray(filters[filter])) && filters[filter].length > 0)
+    const appliedFiltersCount = Object.keys(filters).reduce(reduceNonEmpty, 0)


apps/condo/domains/common/hooks/usePreviousQueryParams.ts

apps/condo/domains/ticket/schema/Ticket.js

apps/condo/domains/ticket/schema/Ticket.test.js

nomerdvadcatpyat · 2024-04-04T17:41:14Z

apps/condo/domains/ticket/utils/tables.utils.ts

+            OR: [
+                { AND: { status: { type_in: [COMPLETED_STATUS_TYPE, CLOSED_STATUS_TYPE] }, isCompletedAfterDeadline: true } },
+                { AND: { status: { type_in: [NEW_OR_REOPENED_STATUS_TYPE, PROCESSING_STATUS_TYPE] }, deadline_lt: (new Date()).toISOString() } },
+            ],


What about deffered status?

nomerdvadcatpyat · 2024-04-04T17:49:48Z

apps/condo/pages/employee/index.tsx

+    const canManageEmployee = get(link, 'role.canInviteNewOrganizationEmployees', null)
+    const employeeId = get(link, 'id')
+
+    usePreviousQueryParams({ trackedParamNames: ['sort', 'filters'], employeeId })


Behavior with saving filters is needed on all pages with filters?

Mb move it to some Context, use it in _app and not not copy paste this logic everywhere where we need filters?

nomerdvadcatpyat · 2024-04-04T17:54:54Z

apps/condo/domains/common/hooks/usePreviousQueryParams.ts

+type usePreviousQueryParamsType = (props: { trackedParamNames: Array<string>, delimitersParamNames?: Array<string>, employeeId?: string }) => void
+
+export const usePreviousQueryParams: usePreviousQueryParamsType = ({
+    delimitersParamNames,


It’s not clear from the name of the argument what it’s responsible for.
Mb tab or some other name?

I can't think of a good name for this variable. Changed it to paramNamesForPageChange and added a docs

nomerdvadcatpyat · 2024-04-08T07:58:01Z

apps/condo/domains/common/hooks/usePreviousQueryParams.ts

+    // // Case without tabs
+    // useEffect(() => {
+    //     if (!employeeId) return
+    //     if (withDelimitersParams) return
+    //     applyQueryParamsFromLocalStorage()
+    // }, [employeeId])
+    // useDeepCompareEffect(() => {
+    //     if (!employeeId) return
+    //     if (withDelimitersParams) return
+    //     saveQueryParamsToLocalStorage()
+    // }, [employeeId, trackedParams])


why you comment it?

Deleted this. Was updated logic

nomerdvadcatpyat · 2024-04-08T08:00:06Z

apps/condo/domains/common/hooks/usePreviousQueryParams.ts

+export const usePreviousQueryParams: usePreviousQueryParamsType = ({
+    delimitersParamNames,
+    employeeId,
+    trackedParamNames,


Ok
Also you can wrap this hook in less common hook, specified to save filters logic and use default params there

nomerdvadcatpyat · 2024-04-08T08:06:35Z

apps/condo/domains/ticket/schema/Ticket.js

@@ -775,16 +785,16 @@ const Ticket = new GQLListSchema('Ticket', {
            if (resolvedStatusId) {
                calculateTicketOrder(resolvedData, resolvedStatusId)

-                const existedStatusId = get(existingItem, 'status', null)
+                const resolvedStatus = await TicketStatus.getOne(context, { id: resolvedStatusId })


can we use here getById?
And below in existedStatus

nomerdvadcatpyat · 2024-04-08T08:13:44Z

apps/condo/domains/ticket/schema/Ticket.test.js

+                expect(updatedTicket8).toHaveProperty('isCompletedAfterDeadline', true)
+            })
+
+            test('Should be auto-set false if status changed to "completed", "closed" or "closed" before deadline', async () => {


Suggested change

test('Should be auto-set false if status changed to "completed", "closed" or "closed" before deadline', async () => {

test('Should be auto-set false if status changed to "completed", "closed" or "canceled" before deadline', async () => {

nomerdvadcatpyat · 2024-04-08T08:18:51Z

apps/condo/domains/ticket/utils/serverSchema/resolveHelpers.js

+    let stopPoint
+
+    if (nextStatusId === STATUS_IDS.DECLINED) {
+        if ((prevStatusId === STATUS_IDS.COMPLETED || prevStatusId === STATUS_IDS.CLOSED || nextStatusId === STATUS_IDS.DECLINED) && completedAt) {


here you check nextStatusId === STATUS_IDS.DECLINED twice

nomerdvadcatpyat · 2024-04-08T08:20:37Z

apps/condo/domains/ticket/utils/serverSchema/resolveHelpers.js

+    } else if (nextStatusId === STATUS_IDS.COMPLETED) {
+        stopPoint = completedAt
+    } else if (nextStatusId === STATUS_IDS.CLOSED) {
+        if ((prevStatusId === STATUS_IDS.COMPLETED || nextStatusId === STATUS_IDS.CLOSED) && completedAt) {


also for nextStatusId === STATUS_IDS.CLOSED

…ket" schema

…ith tables

…le. Refactored page of meter

…tton for reset filters

…d. Fixed calculate "completedAt"

sonarcloud · 2024-04-11T16:04:48Z

Quality Gate passed

Issues
5 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.7% Duplication on New Code

See analysis details on SonarCloud

Alllex202 force-pushed the feat/condo/DOMA-8523/update-filters branch from a8227c8 to 475c0bf Compare April 4, 2024 08:39

Alllex202 added 👶 small Easy to review changes up to 50 lines of code ✋🙂 Review please Comments are resolved, take a look, please 🚨 Migrations We have a database migrations here! labels Apr 4, 2024

Alllex202 requested a review from nomerdvadcatpyat April 4, 2024 11:03

nomerdvadcatpyat reviewed Apr 4, 2024

View reviewed changes

Alllex202 force-pushed the feat/condo/DOMA-8523/update-filters branch from 475c0bf to eab2c0a Compare April 5, 2024 17:35

Alllex202 added 🔬 WIP Not intended to be merged right now, it is a work in progress and removed 👶 small Easy to review changes up to 50 lines of code ✋🙂 Review please Comments are resolved, take a look, please labels Apr 5, 2024

nomerdvadcatpyat reviewed Apr 8, 2024

View reviewed changes

Alllex202 requested a review from nomerdvadcatpyat April 8, 2024 10:59

Alllex202 added ✋🙂 Review please Comments are resolved, take a look, please and removed 🔬 WIP Not intended to be merged right now, it is a work in progress labels Apr 8, 2024

nomerdvadcatpyat approved these changes Apr 8, 2024

View reviewed changes

Alllex202 force-pushed the feat/condo/DOMA-8523/update-filters branch from 2ffd950 to 52fe86b Compare April 9, 2024 10:10

Alllex202 added 14 commits April 11, 2024 20:50

chore(condo): DOMA-8523 added todo

c8a30ab

fix(condo): DOMA-8523 removed search auto-reset in multi-select

de7655b

feat(condo): DOMA-8523 added "isCompletedAfterDeadline" flag for "Tic…

5c6321f

…ket" schema

feat(condo): DOMA-8523 added migrations

e8849ac

feat(condo): DOMA-8523 updated schema

b9e55ed

feat(condo): DOMA-8523 added filter for expired tickets

882482c

feat(condo): DOMA-8523 filters and search depend on query

903b5a5

feat(condo): DOMA-8523 added hook for saving previous query params

a288bd8

feat(condo): DOMA-8523 added saving previous query params for pages w…

5a1c287

…ith tables

feat(condo): DOMA-8523 updated saving previous query params for pages

e2773a1

feat(condo): DOMA-8523 added usePreviousQueryParams to pages with tab…

b672445

…le. Refactored page of meter

refactor(condo): DOMA-8523 fixed imports

4b185ee

fix(condo): DOMA-8523 fixed Select when blur. Fixed Select with tags

357f7f8

feat(condo): DOMA-8523 updated button for open filters. Refactored bu…

2dc6352

…tton for reset filters

Alllex202 added 23 commits April 11, 2024 20:50

feat(condo): DOMA-8523 updated ticket filter layout

404a2bc

feat(condo): DOMA-8523 updated incident filter layout

92c7ca9

feat(condo): DOMA-8523 updated call record filter layout

2319bb5

feat(condo): DOMA-8523 updated marketplace filter layout

f70cf6e

feat(condo): DOMA-8523 updated ticket filter layout

237adbf

feat(condo): DOMA-8523 updated incident filter layout

6313c0e

feat(condo): DOMA-8523 updated meter filter layout

9e9e68f

feat(condo): DOMA-8523 updated miniapps filter layout

137e177

feat(condo): DOMA-8523 added export of function "MeterPageTypeFromQuery"

0d7588e

chore(condo): DOMA-8523 updated callcenter

36432c3

chore(condo): DOMA-8523 updated schema

be9ee85

fix(condo): DOMA-8523 fixed logic for "isCompletedAfterDeadline" fiel…

f3da882

…d. Fixed calculate "completedAt"

fix(condo): DOMA-8523 fixed logic for "isCompletedAfterDeadline" field

929e582

fix(condo): DOMA-8523 updated migrations

05b6271

fix(condo): DOMA-8523 fixed filter

281a9f0

fix(condo): DOMA-8523 fixed after review

08a62d9

fix(condo): DOMA-8523 fixed after review

ca9f313

chore(condo): DOMA-8523 updated after rebase

05f2c73

chore(condo): DOMA-8523 updated schemas

bee315f

fix(condo): DOMA-8523 fixed after review

5bb2b7a

chore(condo): DOMA-8523 updated after rebase

a8e177f

chore(condo): DOMA-8523 updated migrations after rebase

74cfd8e

chore(condo): DOMA-8523 updated callcenter

3691a44

Alllex202 force-pushed the feat/condo/DOMA-8523/update-filters branch from 52fe86b to 3691a44 Compare April 11, 2024 15:59

Alllex202 merged commit ceb7d48 into master Apr 11, 2024
25 checks passed

Alllex202 deleted the feat/condo/DOMA-8523/update-filters branch April 11, 2024 23:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(condo): DOMA-8523 added filter for expired tickets. Added saving previous query params for pages #4571

feat(condo): DOMA-8523 added filter for expired tickets. Added saving previous query params for pages #4571

Alllex202 commented Apr 3, 2024 •

edited

nomerdvadcatpyat Apr 4, 2024

nomerdvadcatpyat Apr 4, 2024

nomerdvadcatpyat Apr 4, 2024

nomerdvadcatpyat Apr 4, 2024

nomerdvadcatpyat Apr 4, 2024 •

edited

Alllex202 Apr 5, 2024

nomerdvadcatpyat Apr 8, 2024

Alllex202 Apr 8, 2024

nomerdvadcatpyat Apr 8, 2024

nomerdvadcatpyat Apr 8, 2024

Alllex202 Apr 8, 2024

nomerdvadcatpyat Apr 8, 2024

nomerdvadcatpyat Apr 8, 2024

Alllex202 Apr 8, 2024

nomerdvadcatpyat Apr 8, 2024

Alllex202 Apr 8, 2024

sonarcloud bot commented Apr 11, 2024

		const reduceNonEmpty = (cnt, filter) => cnt + Number((typeof filters[filter] === 'string' \|\| Array.isArray(filters[filter])) && filters[filter].length > 0)
		const appliedFiltersCount = Object.keys(filters).reduce(reduceNonEmpty, 0)

	test('Should be auto-set false if status changed to "completed", "closed" or "closed" before deadline', async () => {
	test('Should be auto-set false if status changed to "completed", "closed" or "canceled" before deadline', async () => {

feat(condo): DOMA-8523 added filter for expired tickets. Added saving previous query params for pages #4571

feat(condo): DOMA-8523 added filter for expired tickets. Added saving previous query params for pages #4571

Conversation

Alllex202 commented Apr 3, 2024 • edited

Added filter for expired tickets and saving previous query params for pages

Before

After

Updated search behavior in multi-selects

Before

After

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nomerdvadcatpyat Apr 4, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Apr 11, 2024

Quality Gate passed

Alllex202 commented Apr 3, 2024 •

edited

nomerdvadcatpyat Apr 4, 2024 •

edited