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

Core mapping - Admin Page #2970

Merged
merged 55 commits into from
Aug 5, 2024
Merged

Core mapping - Admin Page #2970

merged 55 commits into from
Aug 5, 2024

Conversation

lebaphi
Copy link
Collaborator

@lebaphi lebaphi commented Jun 3, 2024

Fixes #2971

@IanMayo
Copy link
Contributor

IanMayo commented Jun 3, 2024

Hello @lebaphi - the PlayWright testing is currently failing for this. That's quite understandable, since so much as changed.

So, I suggest we (well, you ;-) ) change the CI workflow to comment out the PlayWright testing until this branch is mature, then we will reinstate it.

@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 3, 2024 11:50 Inactive
@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 4, 2024 01:50 Inactive
@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 4, 2024 02:16 Inactive
@Tristina1788
Copy link
Collaborator

I can see 'Core Mapping' from admin page of game 'P10-Test' . But we still in implementing, so I don't check more on this.

image

@IanMayo
Copy link
Contributor

IanMayo commented Jun 4, 2024

Nice work so far @lebaphi 😀

@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 4, 2024 13:53 Inactive
@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 4, 2024 14:07 Inactive
@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 4, 2024 14:16 Inactive
@lebaphi lebaphi marked this pull request as ready for review June 4, 2024 14:17
@lebaphi lebaphi requested a review from IanMayo as a code owner June 4, 2024 14:17
@IanMayo IanMayo requested a review from Tristina1788 June 4, 2024 15:18
@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 4, 2024 15:47 Inactive
@Tristina1788
Copy link
Collaborator

@IanMayo Do you think we should change the 'Delete' icon to '...' icon. And we can have 2 actions (Delete / Duplicate) for each renderer . So that, we can create duplicated renderer and edit properties which we want to change. So it save time for creating.

image

@IanMayo
Copy link
Contributor

IanMayo commented Jun 5, 2024

@IanMayo Do you think we should change the 'Delete' icon to '...' icon. And we can have 2 actions (Delete / Duplicate) for each renderer . So that, we can create duplicated renderer and edit properties which we want to change. So it save time for creating.

Thanks @Tristina1788 - that's a good idea, but we currently only have the two renderers and don't expect them to be duplicated. Let's defer the suggestion for the future.

@Tristina1788
Copy link
Collaborator

Tristina1788 commented Jun 5, 2024

@IanMayo @lebaphi

  • We need 'Core Mapping' on this dropdown list on 'Add Channel' dropdown list.

image

  • The confirm popup should show when user click on 'Delete' property of renderer.

image

  • We should not limit Max Native Zoom/ Max Zoom/ Min Zoom from 1 -> 20. These values should have value > 0 and don't have max number. Ian here: Actually, can we allow 0 to 20 (inc) - that's the reasonable max range of zoom levels for a Leaflet Map

image

  • We don't have 'Others' on 'Edit Property' and 'Icon' property doesn't have upload button to change icon

image

  • Should we have input name of renderer? Currently we have 2 types 'Core', 'MilSym' . If we have same name for renderers. It make admin don't know which renderer he want to update.

image

  • In 'Participants' , roles don't shows any value in dropdown list to select

image

  • I can't update 'Edit props' to 'True'
EditProps._selection_cannot_saved_with_true.mp4

@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 6, 2024 08:08 Inactive
@Tristina1788
Copy link
Collaborator

@lebaphi @IanMayo

  • Now I can update 'Edit props' to 'True'

image

  • Confirm popup show when user click on 'Delete' property of renderer as expected

image

@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 10, 2024 11:05 Inactive
@Tristina1788
Copy link
Collaborator

Tristina1788 commented Jun 10, 2024

@lebaphi @IanMayo We should remove column 'Icon'. And we still don't have the way to update 'Others' because it's not in edit form

image

image

  • Create new Core Mapping channel make the default core mapping channel lose data
new-coremapping.mp4
  • We should have the way to add 'Participants' .

image

@IanMayo
Copy link
Contributor

IanMayo commented Jun 10, 2024

I've just done some testing @lebaphi - it's looking good. Note: for the EnumProperty the game designer needs to provide a list of values (choices), and for NumberProperty there should be an optional Format attribute that controls how the numbers are shown.

Oh, and there should be a lines attribute for a StringProperty.

For string and enum properties there should be a string default attribute, and a numeric one for number properties.

@IanMayo IanMayo had a problem deploying to serge-core-mapping-admi-go19t3 June 10, 2024 12:29 Failure
@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 10, 2024 12:49 Inactive
@Tristina1788
Copy link
Collaborator

@lebaphi User role with 'View Props' = false, 'Edit/Remove Feature' = false, 'Move/Resize Feature' = false, user still can see props and edit/remove , move/resize feature

permission-viewprops_edit-remove.features.mp4

@IanMayo
Copy link
Contributor

IanMayo commented Jun 11, 2024

@lebaphi User role with 'View Props' = false, 'Edit/Remove Feature' = false, 'Move/Resize Feature' = false, user still can see props and edit/remove , move/resize feature

Thanks for the @Tristina1788 . I'll start off on the failure to use the props permission. The mapping permissions may require some trickery we haven't done before (allowing a user to move features from one force but not the other).

@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 14, 2024 08:06 Inactive
@Tristina1788
Copy link
Collaborator

@lebaphi @IanMayo The list roles in force is not correct

image

  • The name of collumns are not correct

image

@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 14, 2024 10:12 Inactive
@IanMayo IanMayo temporarily deployed to serge-core-mapping-admi-go19t3 June 14, 2024 10:16 Inactive
@Tristina1788
Copy link
Collaborator

@lebaphi I see some conflicts. Please resolve them then I can check it.

@Tristina1788
Copy link
Collaborator

@lebaphi I got error when run yarn build. Please help me check again.

image

@Tristina1788
Copy link
Collaborator

@lebaphi @IanMayo

  • Now I can't input zoom values to number < 0 (as expected). But I still don't see our system use URL and Max Native zoom. Can you explain how it work on our system?

image

  • User don't have permission with renderer 'Core' but this user still can update size, move, delete item core. With renderer 'MilSym' , user still can move/ delete without permission.
2024-07-25_15-22-52.mp4
  • New properties of renderer still show ID when adding to 'Filter' although it shows name on properties 's item and 'Add New Item' popup

image

  • Now we can't click 'Show Symbol label' icon to see label. We have to click on that icon and also click on item to see label.
2024-07-25_17-07-14.mp4

@lebaphi
Copy link
Collaborator Author

lebaphi commented Jul 25, 2024

But I still don't see our system use URL and Max Native zoom. Can you explain how it work on our system?

Hi @Tristina1788 , URL is Url Template in this link https://leafletjs.com/reference.html#tilelayer, about Max Native Zoom, I think @IanMayo can help 😄

@IanMayo
Copy link
Contributor

IanMayo commented Jul 25, 2024

But I still don't see our system use URL and Max Native zoom. Can you explain how it work on our system?

Hi @Tristina1788 , URL is Url Template in this link https://leafletjs.com/reference.html#tilelayer, about Max Native Zoom, I think @IanMayo can help 😄

@lebaphi - I'm pretty sure the URL (and maybe maximum zoom) values from the channel should replace these hard-coded values:
image

@lebaphi
Copy link
Collaborator Author

lebaphi commented Jul 25, 2024

But I still don't see our system use URL and Max Native zoom. Can you explain how it work on our system?

Hi @Tristina1788 , URL is Url Template in this link https://leafletjs.com/reference.html#tilelayer, about Max Native Zoom, I think @IanMayo can help 😄

@lebaphi - I'm pretty sure the URL (and maybe maximum zoom) values from the channel should replace these hard-coded values: image

Yep, that is what we have:
image

@IanMayo
Copy link
Contributor

IanMayo commented Jul 25, 2024

Great, @lebaphi - could you take these values from the channel definition instead please?

@Tristina1788
Copy link
Collaborator

@lebaphi @IanMayo

  • I can click 'Show Symbol label' icon to see label as expected.

  • New property in filter shows label as expected

image

  • User still can update properties of item Core / Milsym although the setting doesn't have permission on Core / Milsym
2024-07-26_15-43-52.mp4

@Tristina1788
Copy link
Collaborator

Tristina1788 commented Jul 26, 2024

@lebaphi @IanMayo

  • Try to change some values in Map config and now Core Mapping can get these value for use (I try to update with another url and core mapping can use it) => It works as expected

image

  • Now I added 'Umpire' with full permission on 'Umpire', but I can't update properties of Umpire item
2024-07-26_19-35-33.mp4

@lebaphi
Copy link
Collaborator Author

lebaphi commented Jul 26, 2024

Now I added 'Umpire' with full permission on 'Umpire', but I can't update properties of Umpire item

Hi @Tristina1788, can you check it again on your side, maybe incognito browser? It seems to work on my side

Screen.Recording.2024-07-26.at.8.36.17.PM.mov

@Tristina1788
Copy link
Collaborator

Now I added 'Umpire' with full permission on 'Umpire', but I can't update properties of Umpire item

Hi @Tristina1788, can you check it again on your side, maybe incognito browser? It seems to work on my side

Screen.Recording.2024-07-26.at.8.36.17.PM.mov

@lebaphi I checked on incognitor and the issue still happens. Please uncheck permission for 'Red Force' with 'Move/Resize Feature' = False, 'Edit Pros' = false and check again for Umpire user.

image

@Tristina1788
Copy link
Collaborator

@lebaphi @IanMayo I can't update force property

can.t.update.force.mp4

Steps:

  1. set setting for participants of 'Umpire' role like below

image

  1. set setting for enable to update force for 'Core' renderer

image

  1. Login user 'Umpire' - Game designer, notice user can't update Force propery of a 'umpire' core shape to 'Red' / 'Blue'

@Tristina1788
Copy link
Collaborator

Tristina1788 commented Aug 1, 2024

@lebaphi @IanMayo

  • After updating force 2 times to force which this user don't have permission for 'view partial', the exist items are lost. (User should can't not able to change the force in the second time if it don't have permission 'view partial' or 'Edit Props'` This issue is happened again.
  • Steps:
  1. Create new participant 'Green' with all permission with green items
  2. Update participant 'Umpire' with all permission with 'Red' and 'Blue'
  3. Login to 'Green' user to create many items
  4. Login to 'Umpire' user to update force of an item (example : Red item)
  5. Update Force property to 'Blue' in first time
  6. Update Force property to 'Umpire' ( Or Green which user don't have permission view item) in second time
  7. Login to 'Green' user, notice all items of this user before are dissapeared
2024-08-02_05-52-14.mp4
  • User can't view properties although he has permission 'View Spartial'

Steps:

  1. Update permission for user only has permission 'View Spartial'

image

  1. Login to the user, try to click item on map or items list on the left to view properties. But user can't see properties of that item.

image

More details on video :

2024-08-02_06-00-45.mp4

@lebaphi
Copy link
Collaborator Author

lebaphi commented Aug 2, 2024

User can't view properties although he has permission 'View Spartial'

HI @Tristina1788, user need to have 'View Props' permission to view the item's properties. Items are only visible on the mapping table when 'View Spatial' permission is set to true

@Tristina1788
Copy link
Collaborator

ser need to have 'View Props' permission to view the item's properties. Items are only visible on the mapping table when 'View Spatial' permission is set to true

@lebaphi @IanMayo yes, I mean that. But at that time, I 'm wrong the case . Here is the video for that issue.

No-show-property-When-has-ViewProperty-_acc-RED-view-Blue_.mp4

Anyway, it's fixed now.

  • `After updating force 2 times to force which this user don't have permission for 'view partial', the exist items are lost. (User should can't not able to change the force in the second time if it don't have permission 'view partial' or 'Edit Props'`` => It's also fixed
2024-08-04_17-23-10.mp4

Copy link
Collaborator

@Tristina1788 Tristina1788 left a comment

Choose a reason for hiding this comment

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

It works as expected now.

@IanMayo IanMayo merged commit 7ea32bc into develop Aug 5, 2024
3 checks passed
@IanMayo IanMayo deleted the core-mapping-admin branch August 5, 2024 07:49
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.

Game Designer - create/edit Core Mapping channel
4 participants