Refactoring: entities-table / entity-subrecord #2142

sleidig · 2023-12-21T20:00:31Z

Open TODOs

fix remaining tests
sort overwrite (e.g. TodoListComponent) doesn't work
trying to inline-edit a note (e.g. in child details) always opens the popup
when clicking on a from field saving after inline editing does not reset the unsaved changes state (UnsavedChangesService) so the app still thinks there are unsaved changes
Editing and saving in a popup (note details or row details) does not update the value in the table after closed --> (I couldn't reproduce this, @TheSlimvReal )
Readonly function is not shown in popup (e.g. health check BMI)
More properties are shown in popup (e.g. health check also shows child id form) --> reimplement hideFromTable / hideFromForm

potential further refactoring

DataSource extension to handle all filtering? (replacing FilterService?) --> see https://blog.angular-university.io/angular-material-data-table/ --> Implement a custom DataSource to simplify EntitiesTableComponent #2161

github-actions · 2023-12-21T20:00:52Z

Deployed to https://pr-2142.aam-digital.net/

src/app/core/common-components/entities-table/list-paginator/list-paginator.component.scss

…ist-paginator.component.scss

...components/entities-table/entity-inline-edit-actions/entity-inline-edit-actions.component.ts

…it-actions/entity-inline-edit-actions.component.ts

sleidig · 2024-01-02T15:42:44Z

src/app/core/common-components/entities-table/entities-table.component.ts

+  showEntity(entity: T) {
+    switch (this.clickMode) {
+      case "popup":
+        this.formDialog.openFormPopup(entity, this.columnsToDisplay); // TODO this.formDialog.openFormPopup(entity, this._columns)


we do not correctly support the following flags yet:

hideFromTable?: boolean;

hideFromForm?: boolean;

forTable?: boolean;

--> discuss: where + how do we need these concepts; let's try to simplify and clearly specify this before re-adding the logic.

(e.g. todos-related-to-entity use the process)

we discussed to move towards a different config structure in the future:

config for list columns

config for details fields (popup or fullscreen) separately

config for entity, including custom (run-time calculated) field configs

Might only refactor things towards this at a later point, however.

TheSlimvReal

Really good refactoring. Most comments are quite minor.

On functionality testing I discovered some bugs:

trying to inline-edit a note (e.g. in child details) always opens the popup when clicking on a from field
saving after inline editing does not reset the unsaved changes state (UnsavedChangesService) so the app still thinks there are unsaved changes
Editing and saving in a popup (note details or row details) does not update the value in the table after closed
Readonly function is not shown in popup (e.g. health check BMI)
More properties are shown in popup (e.g. health check also shows child id form)

src/app/child-dev-project/notes/notes-manager/notes-manager.component.ts

src/app/child-dev-project/schools/child-school-overview/child-school-overview.component.ts

src/app/core/common-components/entities-table/entities-table.component.html

src/app/core/common-components/entities-table/entities-table.component.ts

src/app/core/entity-details/related-entities/related-entities.component.ts

...p/core/entity-details/related-time-period-entities/related-time-period-entities.component.ts

… is undefined fixes #2172

TheSlimvReal

Seems to all work well now. There are just two more minor things I discovered.

Inline editing "cancel" does not correctly reset unsavedChanges state
The Task list does by default not show the archived tasks anymore. This results in the weird behavior that when activating the "completed" filter no tasks are shown until the "include archived" is also activated. This is probably something that most users will not figure out.

# Conflicts: # src/app/core/entity-details/related-entities/related-entities.component.spec.ts # src/app/core/entity-details/related-entities/related-entities.component.ts

TheSlimvReal

Great, thanks for also implementing the sorting automation.

aam-digital-ci · 2024-01-15T16:41:14Z

🎉 This PR is included in version 3.29.0-master.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

aam-digital-ci · 2024-01-17T11:42:34Z

🎉 This PR is included in version 3.29.0-master.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

aam-digital-ci · 2024-01-17T12:48:59Z

🎉 This PR is included in version 3.29.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Co-authored-by: Simon <simon@aam-digital.com>

sleidig added 2 commits December 21, 2023 20:59

first step (mostly working) refactoring of entities-table component

1dd2703

Merge branch 'master' into admin-list

2716644

sleidig added 5 commits December 22, 2023 14:08

move code locations

a16d52b

extract inline-edit

2785f19

extract create button

fb2186d

fix some tests

b8d152a

fix remaining tests & bugs

b827d72

sleidig commented Jan 2, 2024

View reviewed changes

src/app/core/common-components/entities-table/list-paginator/list-paginator.component.scss Outdated Show resolved Hide resolved

Update src/app/core/common-components/entities-table/list-paginator/l…

3737477

…ist-paginator.component.scss

sleidig commented Jan 2, 2024

View reviewed changes

...components/entities-table/entity-inline-edit-actions/entity-inline-edit-actions.component.ts Show resolved Hide resolved

sleidig added 2 commits January 2, 2024 16:28

Update src/app/core/common-components/entities-table/entity-inline-ed…

e4b37cb

…it-actions/entity-inline-edit-actions.component.ts

Merge branch 'master' into admin-list

a5b212a

sleidig marked this pull request as ready for review January 2, 2024 15:30

sleidig commented Jan 2, 2024

View reviewed changes

sleidig added 3 commits January 3, 2024 14:30

remove unneeded code

2d139ba

Merge remote-tracking branch 'origin/admin-list' into admin-list

542aca6

Merge branch 'master' into admin-list

f033ddd

TheSlimvReal requested changes Jan 6, 2024

View reviewed changes

sleidig added 11 commits January 8, 2024 13:10

remove unnecessary @UntilDestroy from child classes

30d8444

use base class onInit for ChildSchoolOverview

d1c7a52

remove ngIf for table action columns

5162288

clarify comment for duplicate column config removal

421c983

remove unnecessary updateSubscription variables

d1c0cb4

simplify updateColumnsToDisplayForScreenSize

73ccb14

use super.ngOnInit

bc1e2bb

Merge branch 'master' into admin-list

07e46a9

fix test

d08bb44

fix ed mat

9664842

fix inline editing UI + triggering popup

dacfe71

sleidig added 8 commits January 10, 2024 12:31

fix todo list also navigating in addition to popup

a28498c

fix notes list not updating on undo delete

a3e51dd

Merge branch 'master' into admin-list

21c0360

remove deprecated, unused code

a3d2046

ensure default sort by first column

4353bc4

fix switch highlighting of active entries

8aefdac

fix allowing to overwrite schema field with custom column config

19f07cc

fix test

68abce4

sleidig requested a review from TheSlimvReal January 10, 2024 15:15

fix(core): related-entities can handle records where the mapped field…

3d70d13

… is undefined fixes #2172

TheSlimvReal requested changes Jan 11, 2024

View reviewed changes

sleidig added 4 commits January 11, 2024 17:21

Merge branch 'master' into admin-list

0f71f77

show inactive on todo-list

d3fd01d

disable un-sortable columns sort header automatically

3657756

reset unsaved changes on inline cancel

aea5bd0

sleidig changed the base branch from master to fix-related-entities January 12, 2024 09:54

Merge branch 'fix-related-entities' into admin-list

1735a06

# Conflicts: # src/app/core/entity-details/related-entities/related-entities.component.spec.ts # src/app/core/entity-details/related-entities/related-entities.component.ts

Base automatically changed from fix-related-entities to master January 12, 2024 13:29

Merge branch 'master' into admin-list

a69abab

# Conflicts: # src/app/core/entity-details/related-entities/related-entities.component.spec.ts # src/app/core/entity-details/related-entities/related-entities.component.ts

TheSlimvReal approved these changes Jan 15, 2024

View reviewed changes

Merge branch 'master' into admin-list

cdb3083

TheSlimvReal merged commit 9867c88 into master Jan 15, 2024
5 of 7 checks passed

TheSlimvReal deleted the admin-list branch January 15, 2024 11:52

aam-digital-ci added the released on @master managed by CI (semantic-release) label Jan 15, 2024

aam-digital-ci added the released managed by CI (semantic-release) label Jan 17, 2024

TheSlimvReal mentioned this pull request Jan 22, 2024

[Regression] New health checks are not directly added to table #2186

Closed

sleidig added a commit that referenced this pull request Jan 22, 2024

refactor: entities-table / entity-subrecord (#2142)

c176000

Co-authored-by: Simon <simon@aam-digital.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactoring: entities-table / entity-subrecord #2142

Refactoring: entities-table / entity-subrecord #2142

sleidig commented Dec 21, 2023 •

edited

Loading

github-actions bot commented Dec 21, 2023

sleidig Jan 2, 2024

sleidig Jan 2, 2024

sleidig Jan 8, 2024

TheSlimvReal left a comment •

edited by sleidig

Loading

TheSlimvReal left a comment •

edited by sleidig

Loading

TheSlimvReal left a comment

aam-digital-ci commented Jan 15, 2024

aam-digital-ci commented Jan 17, 2024

aam-digital-ci commented Jan 17, 2024

Refactoring: entities-table / entity-subrecord #2142

Refactoring: entities-table / entity-subrecord #2142

Conversation

sleidig commented Dec 21, 2023 • edited Loading

github-actions bot commented Dec 21, 2023

sleidig Jan 2, 2024

Choose a reason for hiding this comment

sleidig Jan 2, 2024

Choose a reason for hiding this comment

sleidig Jan 8, 2024

Choose a reason for hiding this comment

TheSlimvReal left a comment • edited by sleidig Loading

Choose a reason for hiding this comment

TheSlimvReal left a comment • edited by sleidig Loading

Choose a reason for hiding this comment

TheSlimvReal left a comment

Choose a reason for hiding this comment

aam-digital-ci commented Jan 15, 2024

aam-digital-ci commented Jan 17, 2024

aam-digital-ci commented Jan 17, 2024

sleidig commented Dec 21, 2023 •

edited

Loading

TheSlimvReal left a comment •

edited by sleidig

Loading

TheSlimvReal left a comment •

edited by sleidig

Loading