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

2913_Filter_SIDC_should_not_an_edit_field #2989

Merged
merged 15 commits into from
Jul 11, 2024

Conversation

lilitkarapetyan
Copy link
Collaborator

🧰 Issue

πŸš€ Overview:

πŸ”— Link to preview

πŸ€” Reason:

πŸ”¨Work carried out:

  • Tests pass

πŸ–₯️ Screenshot

Confirmations

  • I have chosen reviewers for my PR.
  • I have assigned myself to this PR.
  • I have chosen an appropriate label for the PR.
  • I have completed the mandatory sections of this document.
  • I have deleted any unused sections.
  • I confirm that I have checked for required README updates and acted accordingly.

πŸ“ Developer Notes:

@lilitkarapetyan lilitkarapetyan added the 4hat Feature/fix of value to 4hat label Jul 1, 2024
@lilitkarapetyan lilitkarapetyan requested a review from IanMayo as a code owner July 1, 2024 10:11
@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 1, 2024 10:11 Inactive
@lilitkarapetyan
Copy link
Collaborator Author

Fixes #2913

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 1, 2024 11:17 Inactive
@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo I still can see 'Edit' button on 'SIDC' filter

image

@lilitkarapetyan
Copy link
Collaborator Author

@lilitkarapetyan @IanMayo I still can see 'Edit' button on 'SIDC' filter

image
We should not see the edit button when using the filter ?

@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo I still can see 'Edit' button on 'SIDC' filter
image
We should not see the edit button when using the filter ?

Yes, I think so. We just need to input sidc ID to filter. @IanMayo How do you think?

@IanMayo
Copy link
Contributor

IanMayo commented Jul 3, 2024

Hello @Tristina1788 - I'm playing in this branch, but there are no features on the mapping tab, and when I log in as Game Designer I can't add any new features. I see the new message for the new feature being sent to the server, but they do not get displayed.
Does it work for you?

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 3, 2024 11:56 Inactive
@lilitkarapetyan
Copy link
Collaborator Author

Hello @Tristina1788 - I'm playing in this branch, but there are no features on the mapping tab, and when I log in as Game Designer I can't add any new features. I see the new message for the new feature being sent to the server, but they do not get displayed. Does it work for you?

I will look now

@lilitkarapetyan
Copy link
Collaborator Author

lilitkarapetyan commented Jul 3, 2024

No, it doesn't work for me, but I think the branch is not the problem.

@Tristina1788
Copy link
Collaborator

Hello @Tristina1788 - I'm playing in this branch, but there are no features on the mapping tab, and when I log in as Game Designer I can't add any new features. I see the new message for the new feature being sent to the server, but they do not get displayed. Does it work for you?

@IanMayo , @lilitkarapetyan We need to login by user Red - Red2 to enable create new item( Umpire force doesn't have permission for create item)

image

@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo We also have the issue on filter SIDC, it's unable to filter with default SIDC.

cant.filter.sidc.default.mp4

@IanMayo
Copy link
Contributor

IanMayo commented Jul 3, 2024

need to login by user Red - Red2 to enable create new item( Umpire force doesn't have permission for create item)

Yes, working correctly as red player @Tristina1788 :-)

Yes, I also saw that supplying a valid SIDC for the filter does not match with any features. That's for you, please @lilitkarapetyan

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 3, 2024 14:20 Inactive
@IanMayo
Copy link
Contributor

IanMayo commented Jul 3, 2024

@lilitkarapetyan @IanMayo I still can see 'Edit' button on 'SIDC' filter

Yes - it's valid to have the Edit button on the SIDC filter, to open the dialog used to generate the SIDC filter

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 4, 2024 08:43 Inactive
@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo I think we don't need to remove 'Edit' button as Ian 's comment above

Now when I filter for sidc which is not default, it also shows the core shape item . And filter with sidc which is default, it shows all items include another sidc.

=> We should show only the milsym which contains the filter sidc

2024-07-04_16-37-01.mp4

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 9, 2024 11:32 Inactive
@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 9, 2024 12:07 Inactive
@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo Now the filter sidc still don't have 'Edit' button ( we should have this button as Ian's expected).

  • Filter sidc with exact code => the result of filter is the milsym has that code and core shape (Should only show milsym has that code).
  • Filter with contains some string sidc code can't work (the filter should show the milsym which contains string in sidc filter)
2024-07-09_20-51-44.mp4

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 10, 2024 07:12 Inactive
@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo Now Sidc filter has 'Edit' button. But 'Id' filter is disabled

image

And these below issues are still happened.

Filter sidc with exact code => the result of filter is the milsym has that code and core shape (Should only show milsym has that code).
Filter with contains some string sidc code can't work (the filter should show the milsym which contains string in sidc filter)

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 10, 2024 10:32 Inactive
@IanMayo
Copy link
Contributor

IanMayo commented Jul 10, 2024

Ok, I think it's ready for you to re-test, please @Tristina1788

@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo Now I can filter Sidc with contains code or equal code. But the 'Id' filter is still disabled.

image

@IanMayo IanMayo temporarily deployed to serge-2913-filter-sidc--craecy July 10, 2024 11:34 Inactive
@lilitkarapetyan
Copy link
Collaborator Author

lilitkarapetyan commented Jul 10, 2024

@lilitkarapetyan @IanMayo Now I can filter Sidc with contains code or equal code. But the 'Id' filter is still disabled.

image

ahh it wasn't pushed ;) I added it

@Tristina1788
Copy link
Collaborator

@lilitkarapetyan @IanMayo Now I can filter with contains / equal sidc and 'Edit' to filter custom sidc well. The 'Id' filter is enable to use.

https://app.screencast.com/5aNMCqa9fhRh1

It works as expected. So we can close this PR.

Copy link
Contributor

@IanMayo IanMayo left a comment

Choose a reason for hiding this comment

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

Tested and working

@IanMayo IanMayo merged commit 9f4807e into develop Jul 11, 2024
3 checks passed
@IanMayo IanMayo deleted the 2913_Filter_SIDC_should_not_an_edit_field branch July 11, 2024 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4hat Feature/fix of value to 4hat
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants