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.

Sign up for GitHub

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

Jump to bottom

#108 feat(ui): Add icons in floorplan #512

Merged
merged 41 commits into from
May 6, 2024
Merged

#108 feat(ui): Add icons in floorplan #512

merged 41 commits into from
May 6, 2024

Conversation

TWilkin
Copy link
Owner

@TWilkin TWilkin commented May 6, 2024

  • Resolves Show sensor and device icon in rooms on UI #108:
    • Work out how many icons we could show. after grouping them by type.
    • Arranges them in a centred nice way.
    • If there are too many, show an ellipsis icon with an explanation of what is hidden.
  • Towards Add doors/window to floorplan #322:
    • Change the icon when a door/window sensor is open/closed.
  • Refactoring:
    • When rotating rotate the floorplan coordinates rather than the SVG, which fixes the alignment issues and ensures the icons are in the correct orientation and order.
    • Remove the outline as it looks bad.
    • Use a context for the API so it's easier to mock in tests.
  • Tests
  • Add tests to all services #297 Add snapshot tests for the Floorplan component.
  • Add test-setup which allows us to wrap any test that uses the API/react-query with the appropriate context providers.

@TWilkin
#108 refactor: Remove unnecessary div from DeviceIcon
02c3f0a
@TWilkin
#108 feat: Add useRoomDevices hook to retrieve the devices/sensors pe…
fa43d2d 
…r room
@TWilkin
#108 feat: Only want to show visible devices
57f0c46
@TWilkin
#108 feat: Support passing additional props to DeviceIcon and SensorIcon
a942569
@TWilkin
#108 feat: Add the icons to the room in approximately the right place
8d868ca
@TWilkin
#108 feat: Support icons in a polygon room
2368e8a
@TWilkin
#108 feat: Rotate the icons if necessary
592da65
@TWilkin
#108 feat: Increase the padding
81e20ce
@TWilkin
#108 fix: Column count wasn't working
2668af2
@TWilkin
#108 feat: Centre it a bit better and add padding
23a3741
@TWilkin
#108 feat: Calculate nice factors for the arrangement
aa18e1d
@TWilkin
#108 feat: Prioritise rows over columns
0a32387
@TWilkin
#108 feat: Remove the console logs
bf91cc6
@TWilkin
#108 feat: Fix priority when rotated
94d2ed8
@TWilkin
#108 refactor: Fix complexity of feasibleFactors
5c0f9a4
@TWilkin
#108 feat: Fix the rotation of the icons when the floorplan is rotated
4828876
@TWilkin
#108 fix: Sorting wasn't deterministic
6b14942
@TWilkin
#108 feat: Remove unnecessary parameter
05ee4d5
@TWilkin
#108 fix: We want alphabetical and count descending
fff9640
@TWilkin
#108 refactor: Massively simplify useRoomDevice hook
64eefba
@TWilkin
#108 refactor: Get the factors in reverse order more efficiently
70e05b5
@TWilkin
#108 fix: Handle incomplete rows and primes
af1596c
@TWilkin
#108 chore: Generated code check-in
d1cd765
@TWilkin
#108 fix: Reduce the device count after finding the best value
1519e3f
@TWilkin
#108 refactor: Remove the outline because it doesn't work properly
ec2aac0
@TWilkin
#322 feat: Change the icon when door/window is open/closed
1f42674
@TWilkin
#108 feat: Add an ellipsis when we're not showing all devices
83b1a40
@TWilkin
#108 chore: Remove a bit more of the outline code
040a68c
@TWilkin
#108 tests: Add tests for SensorIcon
a0e4391
@TWilkin
#108 refactor: Switch the API over to a context provider so it's easi…
3251d4e 
…er to mock
@TWilkin TWilkin added enhancement New feature or request ui Relating to the UI labels May 6, 2024
@TWilkin TWilkin added this to the Widgets milestone May 6, 2024
@TWilkin TWilkin merged commit 312499f into main May 6, 2024
1 check passed
@TWilkin TWilkin deleted the 108.floorplan-icons branch May 6, 2024 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement New feature or request ui Relating to the UI
Projects
None yet
Milestone
Widgets
Development

Successfully merging this pull request may close these issues.

Show sensor and device icon in rooms on UI
1 participant
@TWilkin