feat: populates datatable with subsidies #343

brobro10000 · 2023-06-13T19:54:30Z

Populates datatable with data from the subsidy endpoint
Also sorts and filters leveraging manualSort/manualFilter

Revamps validation for message and regex logic to handle '00k' prefix for the opportunity product.

Pending updated tests

ENT-7113

src/Configuration/Provisioning/DashboardDatatable.jsx

* fix: PR updates * fix: updates

brobro10000 · 2023-06-26T15:37:36Z

package.json

@@ -29,10 +29,10 @@
    "url": "https://github.com/openedx/frontend-app-support-tools/issues"
  },
  "dependencies": {
-    "@edx/brand": "npm:@edx/brand-edx.org@^1.4.2",
+    "@edx/brand": "npm:@edx/brand-[email protected]",


Updated to handle "~@edx/brand/paragon/overrides" import for datatable styles

[inform] Additional context: because this is an open-source repo in the openedx Github organization, the brand-openedx theme should be the default theme installed. Should a consumer want to use the brand-edx.org theme for an MFE, that should be configured outside of committed code. For 2U/edX, the @edx/brand package may be overridden at build+deploy time via configuration (example).

brobro10000 · 2023-06-26T15:38:45Z

package.json

    "@edx/frontend-enterprise-utils": "^3.0.0",
    "@edx/frontend-platform": "^4.2.0",
-    "@edx/paragon": "^20.26.0",
+    "@edx/paragon": "20.45.0",


Upgraded to handle new DjangoShort icon

codecov · 2023-06-26T15:45:42Z

Codecov Report

Patch coverage: 97.82% and project coverage change: +0.21 🎉

Comparison is base (f397748) 87.50% compared to head (8d81730) 87.72%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #343      +/-   ##
==========================================
+ Coverage   87.50%   87.72%   +0.21%     
==========================================
  Files         138      140       +2     
  Lines        2850     2948      +98     
  Branches      682      735      +53     
==========================================
+ Hits         2494     2586      +92     
- Misses        355      361       +6     
  Partials        1        1

Impacted Files	Coverage Δ
src/Configuration/Provisioning/Dashboard.jsx	`100.00% <ø> (+10.52%)`	⬆️
...rc/Configuration/Provisioning/DashboardContext.jsx	`100.00% <ø> (ø)`
src/Configuration/Provisioning/data/constants.js	`100.00% <ø> (ø)`
...ion/testData/Dashboard/DashboardContextWrapper.jsx	`100.00% <ø> (ø)`
...stData/Provisioning/ProvisioningContextWrapper.jsx	`100.00% <ø> (ø)`
src/index.jsx	`0.00% <0.00%> (ø)`
...isioning/DashboardDataTable/DashboardDataTable.jsx	`94.11% <94.11%> (ø)`
...oning/DashboardDataTable/DashboardTableActions.jsx	`100.00% <100.00%> (ø)`
...ioning/DashboardDataTable/DashboardTableBadges.jsx	`100.00% <100.00%> (ø)`
...ning/ProvisioningForm/ProvisioningFormCustomer.jsx	`86.20% <100.00%> (+1.02%)`	⬆️
... and 5 more

... and 24 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

brobro10000 · 2023-06-26T15:47:05Z

src/Configuration/tests/ConfigurationPage.test.jsx

@@ -1,24 +0,0 @@
-import { screen } from '@testing-library/react';


Removed because of duplicate file

adamstankiewicz · 2023-07-10T16:14:25Z

package.json

@@ -29,10 +29,10 @@
    "url": "https://github.com/openedx/frontend-app-support-tools/issues"
  },
  "dependencies": {
-    "@edx/brand": "npm:@edx/brand-edx.org@^1.4.2",
+    "@edx/brand": "npm:@edx/brand-[email protected]",


[inform] Additional context: because this is an open-source repo in the openedx Github organization, the brand-openedx theme should be the default theme installed. Should a consumer want to use the brand-edx.org theme for an MFE, that should be configured outside of committed code. For 2U/edX, the @edx/brand package may be overridden at build+deploy time via configuration (example).

adamstankiewicz · 2023-07-10T16:17:13Z

package.json

@@ -42,7 +42,6 @@
    "classnames": "2.2.6",
    "lodash.debounce": "4.0.8",
    "moment": "2.29.1",
-    "newrelic": "5.13.1",


[inform] Context: newrelic is installed, but seemingly unused by this repo. All New Relic related things for MFEs currently comes from @edx/frontend-build and @edx/frontend-platform, without consumers needing to install newrelic themselves.

Having newrelic in package.json causes issues such as:

❯ npm i npm WARN EBADENGINE Unsupported engine { npm WARN EBADENGINE package: '[email protected]', npm WARN EBADENGINE required: { node: '>=6.0.0 <13.0.0', npm: '>=3.0.0' }, npm WARN EBADENGINE current: { node: 'v18.16.0', npm: '9.5.1' } npm WARN EBADENGINE } npm WARN deprecated [email protected]: This version of the New Relic Node Agent has reached the end of life.

src/Configuration/Provisioning/DashboardDatatable/DashboardDatatable.jsx

src/Configuration/Provisioning/DashboardDatatable/DashboardTableActions.jsx

src/Configuration/Provisioning/ProvisioningForm/ProvisioningFormCustomer.jsx

src/utils/index.js

src/Configuration/Provisioning/data/utils.js

src/Configuration/Provisioning/ProvisioningForm/ProvisioningFormCustomer.jsx

src/data/services/SubsidyApiService.js

package.json

src/Configuration/Provisioning/DashboardDataTable/DashboardDataTable.jsx

adamstankiewicz · 2023-07-12T16:14:18Z

src/Configuration/Provisioning/DashboardDataTable/DashboardDataTable.jsx

+            Header: 'Start date',
+            accessor: 'activeDatetime',
+            disableFilters: true,
+            Cell: ({ row }) => transformDatatableDate(row.values.activeDatetime),


nit: just a caution that if/when these functions were to return JSX, this line and line 94 below would be going against the no-unstable-nested-components ESLint rule. Not suggesting you need to change anything here, but just wanted to inform.

Good point, will leave open for reference 👍🏽

adamstankiewicz · 2023-07-12T16:14:33Z

src/Configuration/Provisioning/DashboardDataTable/DashboardDataTable.jsx

+            Header: 'Start date',
+            accessor: 'activeDatetime',
+            disableFilters: true,
+            Cell: ({ row }) => transformDatatableDate(row.values.activeDatetime),


nitty nit: transformDataTableDate

Same as above, 👍🏽

src/Configuration/Provisioning/DashboardDataTable/DashboardTableActions.jsx

src/Configuration/Provisioning/DashboardDataTable/tests/DashboardTableActions.test.jsx

src/Configuration/Provisioning/data/utils.js

adamstankiewicz

LGTM. 2 additional, non-blocking little nits but

adamstankiewicz · 2023-07-12T18:44:05Z

src/Configuration/Provisioning/DashboardDataTable/DashboardDataTable.jsx

+  const { hydrateEnterpriseSubsidies } = useDashboardContext();
+  const [isLoading, setIsLoading] = useState(true);
+
+  // Implementation due to filterText value displaying accessor value customerName as opposed to Customer Name


[clarification] Is this comment dangling from the now-moved FilterStatus above?

lol yeah it is my bad

adamstankiewicz · 2023-07-13T16:16:37Z

src/Configuration/Provisioning/DashboardDataTable/tests/DashboardTableActions.test.jsx

+
+const { HOME } = ROUTES.CONFIGURATION.SUB_DIRECTORY.PROVISIONING;
+
+const useHistoryPush = jest.fn();


nit: mockHistoryPush might be a slightly more descriptive variable name

brobro10000 added 3 commits June 12, 2023 16:09

feat: Removes perLearnerEnrollmentLimit

e3e7cea

ENT-7113

feat: populates datatable with subsidies

a8f145c

feat: Populate datatable

4666299

brobro10000 force-pushed the hu/ent-fastfix-2 branch from 08207f3 to 4666299 Compare June 21, 2023 20:15

adamstankiewicz reviewed Jun 22, 2023

View reviewed changes

src/Configuration/Provisioning/DashboardDatatable.jsx Outdated Show resolved Hide resolved

src/Configuration/Provisioning/DashboardDatatable.jsx Outdated Show resolved Hide resolved

src/Configuration/Provisioning/DashboardDatatable.jsx Outdated Show resolved Hide resolved

adamstankiewicz and others added 3 commits June 22, 2023 12:01

fix: PR updates (#346)

fa5ff42

* fix: PR updates * fix: updates

feat: Updates paragon and @edx/brand packages

6a94221

chore: merge

0ab500e

brobro10000 force-pushed the hu/ent-fastfix-2 branch from 6ce74bf to dabf3ed Compare June 26, 2023 12:27

chore: npm i

5f58c03

brobro10000 force-pushed the hu/ent-fastfix-2 branch 2 times, most recently from 5995787 to f140065 Compare June 26, 2023 15:36

brobro10000 commented Jun 26, 2023

View reviewed changes

chore: Normalized tests to passing state

3e0f0b8

brobro10000 force-pushed the hu/ent-fastfix-2 branch from f140065 to 3e0f0b8 Compare June 26, 2023 15:39

brobro10000 commented Jun 26, 2023

View reviewed changes

brobro10000 added 2 commits June 26, 2023 17:29

feat: Supports pageCount from subsidy API

5eaebfb

feat: allow graceful fail if no results returned

e27f9c7

brobro10000 mentioned this pull request Jun 26, 2023

feat: Adds support for filter and sort to Subsidy API openedx/enterprise-subsidy#132

Merged

4 tasks

brobro10000 added 8 commits June 27, 2023 09:52

feat: Working datatable sort

744ef78

feat: Filter by enterprise uuid through basic list

5db02c0

feat: filter subsidy uuid and debounce

bdb56fd

feat: removed unused package, newrelic

e5ed3da

fix: Updates financial identifier validation to meet 00k criteria

862cd42

feat: provides the length of characters typed for opportunity product

bf212f8

feat: feature flags edit button on datatable

35e0136

feat: abstraction for greater test coverage

e57189d

brobro10000 force-pushed the hu/ent-fastfix-2 branch from 26cc377 to e57189d Compare June 28, 2023 14:20

brobro10000 added 3 commits June 28, 2023 13:00

feat: testing pt 1

0eb755e

chore: testing 2

4e119bc

chore: testing 3

9d2973f

brobro10000 force-pushed the hu/ent-fastfix-2 branch 4 times, most recently from 69f5101 to 93e90ab Compare July 4, 2023 04:01

chore: testing final

38b040b

brobro10000 force-pushed the hu/ent-fastfix-2 branch from 93e90ab to 38b040b Compare July 7, 2023 14:20

adamstankiewicz reviewed Jul 10, 2023

View reviewed changes

brobro10000 commented Jul 11, 2023

View reviewed changes

src/Configuration/Provisioning/ProvisioningForm/ProvisioningFormCustomer.jsx Outdated Show resolved Hide resolved

src/data/services/SubsidyApiService.js Outdated Show resolved Hide resolved

brobro10000 force-pushed the hu/ent-fastfix-2 branch from 761f446 to ebc8e12 Compare July 11, 2023 19:42

chore: PR fixes

db1fb40

brobro10000 force-pushed the hu/ent-fastfix-2 branch from ebc8e12 to db1fb40 Compare July 11, 2023 20:02

adamstankiewicz reviewed Jul 12, 2023

View reviewed changes

chore: PR fixes 2

4558167

brobro10000 force-pushed the hu/ent-fastfix-2 branch from 44754e1 to 4558167 Compare July 13, 2023 16:15

adamstankiewicz approved these changes Jul 13, 2023

View reviewed changes

chore: PR fixes 2

8d81730

brobro10000 merged commit 3b4941e into master Jul 13, 2023
5 checks passed

brobro10000 deleted the hu/ent-fastfix-2 branch July 13, 2023 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: populates datatable with subsidies #343

feat: populates datatable with subsidies #343

brobro10000 commented Jun 13, 2023 •

edited

Loading

brobro10000 Jun 26, 2023

adamstankiewicz Jul 10, 2023

brobro10000 Jun 26, 2023

codecov bot commented Jun 26, 2023 •

edited

Loading

brobro10000 Jun 26, 2023

adamstankiewicz Jul 10, 2023

adamstankiewicz Jul 10, 2023

adamstankiewicz Jul 12, 2023

brobro10000 Jul 12, 2023

adamstankiewicz Jul 12, 2023

brobro10000 Jul 12, 2023

adamstankiewicz left a comment

adamstankiewicz Jul 12, 2023

brobro10000 Jul 13, 2023

adamstankiewicz Jul 13, 2023

		@@ -1,24 +0,0 @@
		import { screen } from '@testing-library/react';


		const { HOME } = ROUTES.CONFIGURATION.SUB_DIRECTORY.PROVISIONING;

		const useHistoryPush = jest.fn();

feat: populates datatable with subsidies #343

feat: populates datatable with subsidies #343

Conversation

brobro10000 commented Jun 13, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Jun 26, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adamstankiewicz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brobro10000 commented Jun 13, 2023 •

edited

Loading

codecov bot commented Jun 26, 2023 •

edited

Loading