Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Waitp 1231 base matrix part 2 #4714

Merged

Conversation

alexd-bes
Copy link
Contributor

@alexd-bes alexd-bes commented Jul 9, 2023

Issue WAITP-1231: Matrix Ui component part 2

Changes:

  • Updated presentation option types in types package
  • Added styling and handling for column groups
  • Added handling for hideColumnTitles
  • Added handling for label
  • Added handling for markdown in presentation options description
  • Added handling for categoryPresentationOptions
  • Added handling for applyLocation
  • Added stories

NOTE: This is an extension off WAITP-1231 part 1, so some changes are actually from the initial branch

Screenshots:

Hidden column titles
Screenshot 2023-07-10 at 10 57 15 am

Markdown presentation options

Screenshot 2023-07-10 at 10 57 30 am

Category presentation options

Screenshot 2023-07-10 at 10 57 50 am

Grouped columns

Screenshot 2023-07-10 at 10 58 08 am

Apply location option

Screenshot 2023-07-10 at 10 58 20 am

@tcaiger tcaiger changed the base branch from epic-frontend-rewrite to waitp-1231-base-matrix-component July 10, 2023 23:31
@@ -1265,171 +1265,341 @@ export const MatrixConfigSchema = {
},
"presentationOptions": {
"description": "Allows for conditional styling",
"type": "object",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any idea what's going on here. Is it just formatting?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is when I ran generate on the types package, because the build was failing because the types had changed

Copy link
Contributor

@tcaiger tcaiger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

tcaiger and others added 6 commits July 11, 2023 11:48
* setup map entites

* wip

* wip

* re organise project view

* mobile search layout

* polygon layer

* map animation

* fix mini map

* Update Dashboard.tsx

* merging

* map overlay data

* add Map overlays feature folder

* useEntitiesWithLocation

* typescript

* remove test code

* Update InteractivePolygon.tsx

* set up

* fix api

* marker layer

* Update types.d.ts

* update map layout

* wip map overlays

* revert map control layout

* Update useEntities.ts

* copy lesmis

* wip

* Update MapOverlayList.tsx

* default map overlay

* radius overlays

* navigate to dashboard

* fix scroll

* measure level

* refactor marker layer

* refactor useDefaultMapOverlay

* types

* useEntitiesByMeasureLevel

* Update MapOverlaysRoute.ts

* fix active entity

* Update MarkerLayer.tsx

* add comments

* Update processMeasureData.ts

* refactor useDefaultMapOverlay
@alexd-bes alexd-bes merged commit e92400d into waitp-1231-base-matrix-component Jul 11, 2023
@alexd-bes alexd-bes deleted the waitp-1231-base-matrix-part-2 branch July 11, 2023 03:14
alexd-bes added a commit that referenced this pull request Jul 11, 2023
* WAITP-1231 Working table

* WIP

* Update Matrix.tsx

* Fix linting errors

* convert to use context

* Update hooks

* Fix issues

* Reorganise files

* reorganise context

* Working table

* Remove enlarged cell modal file

* Working modal

* Tidy up

* Update MatrixCell.tsx

* Tidy up hover

* Add cell handling for markdown

* fix types

* WAITP-1231 fixes

* Delete types.d.ts

* Update index.ts

* Fix type error

* Waitp 1231 base matrix part 2 (#4714)

* Working legend, grouped columns

* Apply location values

* Tidy up

* Styled column groups

* Tiy up files

* Add in hidden column titles

* Update hidden column title and config types

* Generate types

* Move the buttons

* WAITP-1222: Marker layer (#4686)

* setup map entites

* wip

* wip

* re organise project view

* mobile search layout

* polygon layer

* map animation

* fix mini map

* Update Dashboard.tsx

* merging

* map overlay data

* add Map overlays feature folder

* useEntitiesWithLocation

* typescript

* remove test code

* Update InteractivePolygon.tsx

* set up

* fix api

* marker layer

* Update types.d.ts

* update map layout

* wip map overlays

* revert map control layout

* Update useEntities.ts

* copy lesmis

* wip

* Update MapOverlayList.tsx

* default map overlay

* radius overlays

* navigate to dashboard

* fix scroll

* measure level

* refactor marker layer

* refactor useDefaultMapOverlay

* types

* useEntitiesByMeasureLevel

* Update MapOverlaysRoute.ts

* fix active entity

* Update MarkerLayer.tsx

* add comments

* Update processMeasureData.ts

* refactor useDefaultMapOverlay

* Fix merge conflicts

* Fix conflict errors

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>
tcaiger added a commit that referenced this pull request Jul 12, 2023
* WAITP-1231 Working table

* WIP

* Update Matrix.tsx

* Fix linting errors

* convert to use context

* Update hooks

* Fix issues

* Reorganise files

* reorganise context

* Working table

* Remove enlarged cell modal file

* Working modal

* Tidy up

* Update MatrixCell.tsx

* Tidy up hover

* Add cell handling for markdown

* fix types

* WAITP-1231 fixes

* Delete types.d.ts

* Update index.ts

* Fix type error

* Waitp 1231 base matrix part 2 (#4714)

* Working legend, grouped columns

* Apply location values

* Tidy up

* Styled column groups

* Tiy up files

* Add in hidden column titles

* Update hidden column title and config types

* Generate types

* Move the buttons

* WAITP-1222: Marker layer (#4686)

* setup map entites

* wip

* wip

* re organise project view

* mobile search layout

* polygon layer

* map animation

* fix mini map

* Update Dashboard.tsx

* merging

* map overlay data

* add Map overlays feature folder

* useEntitiesWithLocation

* typescript

* remove test code

* Update InteractivePolygon.tsx

* set up

* fix api

* marker layer

* Update types.d.ts

* update map layout

* wip map overlays

* revert map control layout

* Update useEntities.ts

* copy lesmis

* wip

* Update MapOverlayList.tsx

* default map overlay

* radius overlays

* navigate to dashboard

* fix scroll

* measure level

* refactor marker layer

* refactor useDefaultMapOverlay

* types

* useEntitiesByMeasureLevel

* Update MapOverlaysRoute.ts

* fix active entity

* Update MarkerLayer.tsx

* add comments

* Update processMeasureData.ts

* refactor useDefaultMapOverlay

* Fix merge conflicts

* Fix conflict errors

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>
tcaiger added a commit that referenced this pull request Jul 12, 2023
* WAITP-1231 Working table

* WIP

* Update Matrix.tsx

* Fix linting errors

* convert to use context

* Update hooks

* Fix issues

* Reorganise files

* reorganise context

* Working table

* Remove enlarged cell modal file

* Working modal

* Tidy up

* Update MatrixCell.tsx

* Tidy up hover

* Add cell handling for markdown

* fix types

* WAITP-1231 fixes

* Delete types.d.ts

* Update index.ts

* Fix type error

* Waitp 1231 base matrix part 2 (#4714)

* Working legend, grouped columns

* Apply location values

* Tidy up

* Styled column groups

* Tiy up files

* Add in hidden column titles

* Update hidden column title and config types

* Generate types

* Move the buttons

* WAITP-1222: Marker layer (#4686)

* setup map entites

* wip

* wip

* re organise project view

* mobile search layout

* polygon layer

* map animation

* fix mini map

* Update Dashboard.tsx

* merging

* map overlay data

* add Map overlays feature folder

* useEntitiesWithLocation

* typescript

* remove test code

* Update InteractivePolygon.tsx

* set up

* fix api

* marker layer

* Update types.d.ts

* update map layout

* wip map overlays

* revert map control layout

* Update useEntities.ts

* copy lesmis

* wip

* Update MapOverlayList.tsx

* default map overlay

* radius overlays

* navigate to dashboard

* fix scroll

* measure level

* refactor marker layer

* refactor useDefaultMapOverlay

* types

* useEntitiesByMeasureLevel

* Update MapOverlaysRoute.ts

* fix active entity

* Update MarkerLayer.tsx

* add comments

* Update processMeasureData.ts

* refactor useDefaultMapOverlay

* Fix merge conflicts

* Fix conflict errors

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants