Skip to content

Commit

Permalink
refactor(viewReducer): sw-1781 optimize view query (#1236)
Browse files Browse the repository at this point in the history 
* inventory, toolbarFields, update store dispatch
* viewReducer, simplify query actions, types
  • Loading branch information
@cdcabrera
cdcabrera committed Nov 28, 2023
1 parent 8840265 commit 6d1f06d
Show file tree
Hide file tree
Showing 28 changed files with 375 additions and 1,152 deletions.
30 changes: 18 additions & 12 deletions ...inventoryCardInstances/__tests__/__snapshots__/inventoryCardInstancesContext.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,27 +115,31 @@ exports[`InventoryCardInstancesContext should handle an onColumnSort event: onCo
[
[
{
"dir": "desc",
"type": "SET_QUERY_RHSM_HOSTS_INVENTORY_dir",
"filter": "dir",
"type": "SET_QUERY_INVENTORY_INSTANCES",
"value": "desc",
"viewId": "lorem",
},
{
"sort": "loremIpsumColumnOne",
"type": "SET_QUERY_RHSM_HOSTS_INVENTORY_sort",
"filter": "sort",
"type": "SET_QUERY_INVENTORY_INSTANCES",
"value": "loremIpsumColumnOne",
"viewId": "lorem",
},
],
],
[
[
{
"dir": "asc",
"type": "SET_QUERY_RHSM_HOSTS_INVENTORY_dir",
"filter": "dir",
"type": "SET_QUERY_INVENTORY_INSTANCES",
"value": "asc",
"viewId": "lorem",
},
{
"sort": "loremIpsumColumnOne",
"type": "SET_QUERY_RHSM_HOSTS_INVENTORY_sort",
"filter": "sort",
"type": "SET_QUERY_INVENTORY_INSTANCES",
"value": "loremIpsumColumnOne",
"viewId": "lorem",
},
],
Expand All @@ -148,13 +152,15 @@ exports[`InventoryCardInstancesContext should handle an onPage event: onPage eve
[
[
{
"offset": 1,
"type": "SET_QUERY_RHSM_HOSTS_INVENTORY_offset",
"filter": "offset",
"type": "SET_QUERY_INVENTORY_INSTANCES",
"value": 1,
"viewId": "lorem",
},
{
"limit": 5,
"type": "SET_QUERY_RHSM_HOSTS_INVENTORY_limit",
"filter": "limit",
"type": "SET_QUERY_INVENTORY_INSTANCES",
"value": 5,
"viewId": "lorem",
},
],
Expand Down
20 changes: 12 additions & 8 deletions src/components/inventoryCardInstances/inventoryCardInstancesContext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,16 @@ const useOnPageInstances = ({
return ({ offset, perPage }) => {
dispatch([
{
type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.OFFSET],
type: reduxTypes.query.SET_QUERY_INVENTORY_INSTANCES,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.OFFSET]: offset
filter: RHSM_API_QUERY_SET_TYPES.OFFSET,
value: offset
},
{
type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.LIMIT],
type: reduxTypes.query.SET_QUERY_INVENTORY_INSTANCES,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.LIMIT]: perPage
filter: RHSM_API_QUERY_SET_TYPES.LIMIT,
value: perPage
}
]);
};
Expand Down Expand Up @@ -279,14 +281,16 @@ const useOnColumnSortInstances = ({

dispatch([
{
type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.DIRECTION],
type: reduxTypes.query.SET_QUERY_INVENTORY_INSTANCES,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.DIRECTION]: updatedDirection
filter: RHSM_API_QUERY_SET_TYPES.DIRECTION,
value: updatedDirection
},
{
type: reduxTypes.query.SET_QUERY_RHSM_HOSTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.SORT],
type: reduxTypes.query.SET_QUERY_INVENTORY_INSTANCES,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.SORT]: updatedSortColumn
filter: RHSM_API_QUERY_SET_TYPES.SORT,
value: updatedSortColumn
}
]);
};
Expand Down
30 changes: 18 additions & 12 deletions ...yCardSubscriptions/__tests__/__snapshots__/inventoryCardSubscriptionsContext.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,31 @@ exports[`InventoryCardSubscriptionsContext should handle an onColumnSort event:
[
[
{
"dir": "desc",
"type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_dir",
"filter": "dir",
"type": "SET_QUERY_INVENTORY_SUBSCRIPTIONS",
"value": "desc",
"viewId": "lorem",
},
{
"sort": "loremIpsumColumnOne",
"type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_sort",
"filter": "sort",
"type": "SET_QUERY_INVENTORY_SUBSCRIPTIONS",
"value": "loremIpsumColumnOne",
"viewId": "lorem",
},
],
],
[
[
{
"dir": "asc",
"type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_dir",
"filter": "dir",
"type": "SET_QUERY_INVENTORY_SUBSCRIPTIONS",
"value": "asc",
"viewId": "lorem",
},
{
"sort": "loremIpsumColumnOne",
"type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_sort",
"filter": "sort",
"type": "SET_QUERY_INVENTORY_SUBSCRIPTIONS",
"value": "loremIpsumColumnOne",
"viewId": "lorem",
},
],
Expand All @@ -51,13 +55,15 @@ exports[`InventoryCardSubscriptionsContext should handle an onPage event: onPage
[
[
{
"offset": 1,
"type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_offset",
"filter": "offset",
"type": "SET_QUERY_INVENTORY_SUBSCRIPTIONS",
"value": 1,
"viewId": "lorem",
},
{
"limit": 5,
"type": "SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_limit",
"filter": "limit",
"type": "SET_QUERY_INVENTORY_SUBSCRIPTIONS",
"value": 5,
"viewId": "lorem",
},
],
Expand Down
20 changes: 12 additions & 8 deletions src/components/inventoryCardSubscriptions/inventoryCardSubscriptionsContext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,16 @@ const useOnPageSubscriptions = ({
return ({ offset, perPage }) => {
dispatch([
{
type: reduxTypes.query.SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.OFFSET],
type: reduxTypes.query.SET_QUERY_INVENTORY_SUBSCRIPTIONS,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.OFFSET]: offset
filter: RHSM_API_QUERY_SET_TYPES.OFFSET,
value: offset
},
{
type: reduxTypes.query.SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.LIMIT],
type: reduxTypes.query.SET_QUERY_INVENTORY_SUBSCRIPTIONS,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.LIMIT]: perPage
filter: RHSM_API_QUERY_SET_TYPES.LIMIT,
value: perPage
}
]);
};
Expand Down Expand Up @@ -202,14 +204,16 @@ const useOnColumnSortSubscriptions = ({

dispatch([
{
type: reduxTypes.query.SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.DIRECTION],
type: reduxTypes.query.SET_QUERY_INVENTORY_SUBSCRIPTIONS,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.DIRECTION]: updatedDirection
filter: RHSM_API_QUERY_SET_TYPES.DIRECTION,
value: updatedDirection
},
{
type: reduxTypes.query.SET_QUERY_RHSM_SUBSCRIPTIONS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.SORT],
type: reduxTypes.query.SET_QUERY_INVENTORY_SUBSCRIPTIONS,
viewId: productId,
[RHSM_API_QUERY_SET_TYPES.SORT]: updatedSortColumn
filter: RHSM_API_QUERY_SET_TYPES.SORT,
value: updatedSortColumn
}
]);
};
Expand Down
10 changes: 6 additions & 4 deletions src/components/inventoryGuests/__tests__/__snapshots__/inventoryGuestsContext.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ exports[`InventoryGuestsContext should handle an onScroll event: onPage event, d
[
[
{
"offset": 100,
"type": "SET_QUERY_RHSM_GUESTS_INVENTORY_offset",
"filter": "offset",
"type": "SET_QUERY_GRAPH",
"value": 100,
"viewId": "1234567890",
},
{
"limit": 100,
"type": "SET_QUERY_RHSM_GUESTS_INVENTORY_limit",
"filter": "limit",
"type": "SET_QUERY_GRAPH",
"value": 100,
"viewId": "1234567890",
},
],
Expand Down
10 changes: 6 additions & 4 deletions src/components/inventoryGuests/inventoryGuestsContext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,16 @@ const useOnScroll = (
if (numberOfGuests > currentPage + limit && bottom && !pending) {
dispatch([
{
type: reduxTypes.query.SET_QUERY_RHSM_GUESTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.OFFSET],
type: reduxTypes.query.SET_QUERY_GRAPH,
viewId: id,
[RHSM_API_QUERY_SET_TYPES.OFFSET]: currentPage + limit
filter: RHSM_API_QUERY_SET_TYPES.OFFSET,
value: currentPage + limit
},
{
type: reduxTypes.query.SET_QUERY_RHSM_GUESTS_INVENTORY_TYPES[RHSM_API_QUERY_SET_TYPES.LIMIT],
type: reduxTypes.query.SET_QUERY_GRAPH,
viewId: id,
[RHSM_API_QUERY_SET_TYPES.LIMIT]: limit
filter: RHSM_API_QUERY_SET_TYPES.LIMIT,
value: limit
}
]);
}
Expand Down
45 changes: 27 additions & 18 deletions src/components/toolbar/__tests__/__snapshots__/toolbarContext.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ exports[`ToolbarContext should apply a hook for clearing a toolbar field through
"viewId": undefined,
},
{
"billing_provider": null,
"type": "SET_QUERY_RHSM_billing_provider",
"filter": "billing_provider",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand Down Expand Up @@ -41,8 +42,9 @@ exports[`ToolbarContext should apply a hook for clearing a toolbar field through
"viewId": undefined,
},
{
"sla": null,
"type": "SET_QUERY_RHSM_sla",
"filter": "sla",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand All @@ -54,8 +56,9 @@ exports[`ToolbarContext should apply a hook for clearing a toolbar field through
"viewId": undefined,
},
{
"type": "SET_QUERY_RHSM_usage",
"usage": null,
"filter": "usage",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand All @@ -72,8 +75,9 @@ exports[`ToolbarContext should apply a hook for clearing specific active toolbar
"viewId": undefined,
},
{
"billing_provider": null,
"type": "SET_QUERY_RHSM_billing_provider",
"filter": "billing_provider",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand Down Expand Up @@ -104,8 +108,9 @@ exports[`ToolbarContext should apply a hook for clearing specific active toolbar
"viewId": undefined,
},
{
"sla": null,
"type": "SET_QUERY_RHSM_sla",
"filter": "sla",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand All @@ -117,8 +122,9 @@ exports[`ToolbarContext should apply a hook for clearing specific active toolbar
"viewId": undefined,
},
{
"type": "SET_QUERY_RHSM_usage",
"usage": null,
"filter": "usage",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand All @@ -130,8 +136,9 @@ exports[`ToolbarContext should apply a hook for clearing specific active toolbar
"viewId": undefined,
},
{
"billing_provider": null,
"type": "SET_QUERY_RHSM_billing_provider",
"filter": "billing_provider",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand Down Expand Up @@ -162,8 +169,9 @@ exports[`ToolbarContext should apply a hook for clearing specific active toolbar
"viewId": undefined,
},
{
"sla": null,
"type": "SET_QUERY_RHSM_sla",
"filter": "sla",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand All @@ -175,8 +183,9 @@ exports[`ToolbarContext should apply a hook for clearing specific active toolbar
"viewId": undefined,
},
{
"type": "SET_QUERY_RHSM_usage",
"usage": null,
"filter": "usage",
"type": "SET_QUERY",
"value": null,
"viewId": undefined,
},
],
Expand Down
10 changes: 6 additions & 4 deletions src/components/toolbar/__tests__/__snapshots__/toolbarFieldBillingProvider.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ exports[`ToolbarFieldBillingProvider Component should handle updating sla throug
"viewId": undefined,
},
{
"billing_provider": "red hat",
"type": "SET_QUERY_RHSM_billing_provider",
"filter": "billing_provider",
"type": "SET_QUERY",
"value": "red hat",
"viewId": undefined,
},
],
Expand All @@ -42,8 +43,9 @@ exports[`ToolbarFieldBillingProvider Component should handle updating sla throug
"viewId": "loremIpsum",
},
{
"billing_provider": "dolor sit",
"type": "SET_QUERY_RHSM_billing_provider",
"filter": "billing_provider",
"type": "SET_QUERY",
"value": "dolor sit",
"viewId": "loremIpsum",
},
],
Expand Down
Loading

0 comments on commit 6d1f06d

Please sign in to comment.