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

HPCC-30771 ECL Watch v9 WUs list filter allow multiple clusters #18536

Merged
merged 1 commit into from
Apr 18, 2024
Merged

HPCC-30771 ECL Watch v9 WUs list filter allow multiple clusters #18536

merged 1 commit into from
Apr 18, 2024

Conversation

jeclrsg
Copy link
Contributor

@jeclrsg jeclrsg commented Apr 15, 2024 •
edited by GordonSmith
Loading

Changed our AsyncDropdown component to accept a "multiSelect" parameter (which is already built-in to the extended FluentUI Dropdown)

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@jeclrsg jeclrsg requested a review from GordonSmith April 15, 2024 15:47
@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-30771

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

GordonSmith
GordonSmith requested changes Apr 16, 2024
View reviewed changes
esp/src/src-react/components/forms/Fields.tsx Outdated
if (multiSelect) {
const items: IDropdownOption[] = [];
if (selectedItems?.length > 0) {
selectedItems.forEach(item => items.push(item));
Copy link
Member

Choose a reason for hiding this comment

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

items = [...selectedItems]?

esp/src/src-react/components/forms/Fields.tsx Outdated
item = selOptions?.find(row => row.key === selectedItem?.key) ?? selOptions[0];
if (multiSelect) {
const items: IDropdownOption[] = [];
if (selectedItems?.length > 0) {
Copy link
Member

Choose a reason for hiding this comment

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

Can selectedItems be undefined?

Copy link
Member

Choose a reason for hiding this comment

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

Is the if needed?

esp/src/src-react/components/forms/Fields.tsx Outdated
} else {
if (selectedKey === "") return;
const keys = selectedKey.split("|");
if (keys.length > 0) {
Copy link
Member

Choose a reason for hiding this comment

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

Is the if needed?

esp/src/src-react/components/forms/Fields.tsx Outdated
if (selectedKey === "") return;
const keys = selectedKey.split("|");
if (keys.length > 0) {
keys.forEach(key => items.push({ key: key, text: key }));
Copy link
Member

Choose a reason for hiding this comment

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

Minor: items = keys.map?

esp/src/src-react/components/forms/Fields.tsx
}
} else {
setSelectedItems(items);
}
Copy link
Member

Choose a reason for hiding this comment

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

Lines 127 -> 135 is equivalent to:

if (items.length && (!selectedItems.length || JSON.stringify(items.map(item => item.key)) !== JSON.stringify(selectedKey.split("|")))) {
   setSelectedItems(items);
}

Is that correct (I am not understanding the !selectedItems.length condition)?

Copy link
Member

Choose a reason for hiding this comment

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

@jeclrsg bump?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That wouldn't be right to coalesce, because the if condition should do nothing when the items array and selectedKey are the same. Similar to the non-multiselect version (#16904 (comment))

Copy link
Member

Choose a reason for hiding this comment

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

I did have a !== in there. But it was more for me to understand why the !selectedItem.length was specialised - probably to do with initial load?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's right, it's for the initial loading of selectedItems from the url

esp/src/src-react/components/forms/Fields.tsx Outdated
if (multiSelect) {
if (!selectedItems.length) return;
if (selectedItems.length > 1) {
if (JSON.stringify(selectedItems.map(item => item.key)) === JSON.stringify(selectedKey.split("|"))) return;
Copy link
Member

Choose a reason for hiding this comment

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

Minor: The following would be more efficient I suspect (same for above):

if (selectedItems.map(item => item.key).join("|") === selectedKey) return;

@jeclrsg jeclrsg force-pushed the hpcc-30771-filter-cluster-multiselect branch from eb6dd51 to d85412d Compare April 16, 2024 20:14
@jeclrsg
HPCC-30771 ECL Watch v9 WUs list filter allow multiple clusters
bab20ed 
Changed our AsyncDropdown component to accept a "multiSelect" parameter
(which is already built-in to the extended FluentUI Dropdown)

Signed-off-by: Jeremy Clements <[email protected]>
@jeclrsg jeclrsg force-pushed the hpcc-30771-filter-cluster-multiselect branch from d85412d to bab20ed Compare April 16, 2024 20:16
@GordonSmith GordonSmith merged commit 35f1a67 into hpcc-systems:candidate-9.2.x Apr 18, 2024
51 checks passed
@jeclrsg jeclrsg deleted the hpcc-30771-filter-cluster-multiselect branch May 15, 2024 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GordonSmith GordonSmith GordonSmith approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jeclrsg @GordonSmith