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

[MPDX-7853] Add contact details designation account column #871

Merged
merged 12 commits into from
Apr 30, 2024
37 changes: 12 additions & 25 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
13 changes: 13 additions & 0 deletions .yarn/patches/@mui-x-data-grid-npm-5.17.4-542730a19e.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/components/panel/GridPanel.js b/components/panel/GridPanel.js
index e832b6b806fa0e0a40b79ba299917c81198daaf1..5c0551f98dfe7dc57bd7b168f8d1eb4d9f7e34d2 100644
--- a/components/panel/GridPanel.js
+++ b/components/panel/GridPanel.js
@@ -76,7 +76,7 @@ const GridPanel = /*#__PURE__*/React.forwardRef((props, ref) => {

return /*#__PURE__*/_jsx(GridPanelRoot, _extends({
ref: ref,
- placement: "bottom-start",
+ placement: "top-start",
className: clsx(className, classes.panel),
anchorEl: anchorEl,
modifiers: modifiers
15 changes: 11 additions & 4 deletions __tests__/util/graphqlMocking.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,35 @@ import {
ergonomock,
} from 'graphql-ergonomock';
import { DefaultMockResolvers } from 'graphql-ergonomock/dist/mock';
import random from 'graphql-ergonomock/dist/utils/random';
import { gql } from 'graphql-tag';
import seedrandom from 'seedrandom';
import { DeepPartial } from 'ts-essentials';
import schema from 'src/graphql/schema.graphql';
import { createCache } from 'src/lib/apollo/cache';

const seed = 'seed';
const rng = seedrandom(seed);

const resolvers: DefaultMockResolvers = {
ISO8601DateTime: () =>
// Time in 2022
new Date(
1641016800000 /* Jan 1, 2022 */ + Math.floor(rng() * 365 * 86400) * 1000,
1641016800000 /* Jan 1, 2022 */ + random.integer(365 * 86400 * 1000),
).toISOString(),
ISO8601Date: () =>
// Date in 2022
new Date(
1641016800000 /* Jan 1, 2022 */ + Math.floor(rng() * 365) * 86400 * 1000,
1641016800000 /* Jan 1, 2022 */ + random.integer(365 * 86400 * 1000),
)
.toISOString()
.slice(0, 10),
String: (_root, _args, _context, info) => {
if (info.fieldName.toLowerCase().endsWith('currency')) {
// Return a random valid currency
const currencies = ['USD', 'CAD', 'EUR'];
return currencies[random.integer(currencies.length)];
}
return random.words();
},
};

export const GqlMockedProvider = <TData,>({
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"@mui/x-date-pickers": "^7.0.0-beta.7",
"@react-google-maps/api": "^2.13.1",
"@rollbar/react": "^0.11.1",
"@types/seedrandom": "^3.0.5",
canac marked this conversation as resolved.
Show resolved Hide resolved
"apollo-datasource-rest": "^3.7.0",
"apollo-server-micro": "^3.11.0",
"apollo3-cache-persist": "^0.14.1",
Expand Down Expand Up @@ -84,7 +83,6 @@
"react-virtuoso": "2.19.0",
"recharts": "2.3.2",
"rollbar": "^2.25.2",
"seedrandom": "^3.0.5",
"storybook": "^6.5.16",
"tslib": "^2.4.0",
"tss-react": "^4.1.3",
Expand Down Expand Up @@ -180,7 +178,8 @@
"package-json/got": "^11.8.5",
"http-cache-semantics": "~4.1.1",
"cacheable-request": "^10.2.7",
"@mui/[email protected]": "patch:@mui/base@npm%3A5.0.0-alpha.98#./.yarn/patches/@mui-base-npm-5.0.0-alpha.98-f4d605d753.patch"
"@mui/[email protected]": "patch:@mui/base@npm%3A5.0.0-alpha.98#./.yarn/patches/@mui-base-npm-5.0.0-alpha.98-f4d605d753.patch",
"@mui/x-data-grid@^5.17.4": "patch:@mui/x-data-grid@npm%3A5.17.4#./.yarn/patches/@mui-x-data-grid-npm-5.17.4-542730a19e.patch"
},
"lint-staged": {
"*.{js,ts,tsx}": "eslint --cache --fix"
Expand Down
88 changes: 44 additions & 44 deletions src/components/Coaching/LoadCoachingList.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,77 +23,77 @@ describe('LoadCoaching', () => {
"nodes": Array [
Object {
"__typename": "CoachingAccountList",
"balance": 26.507845354363234,
"currency": "Kitchen Star Restaurant",
"balance": 64.55430394702351,
"currency": "CAD",
"id": "7671408",
"monthlyGoal": 32,
"monthlyGoal": 12,
"name": "Diamond Sword Restaurant",
"primaryAppeal": Object {
"__typename": "CoachingAppeal",
"active": false,
"amount": 71.24003484887974,
"amountCurrency": "Gloves Tennis racquet Pebble",
"id": "8018947",
"name": "Rifle Feather Videotape",
"pledgesAmountNotReceivedNotProcessed": 18.46232645104087,
"pledgesAmountProcessed": 12.197856859203839,
"pledgesAmountTotal": 64.55430394702351,
"amountCurrency": "EUR",
"id": "4377364",
"name": "Pebble Solid Triangle",
"pledgesAmountNotReceivedNotProcessed": 70.20389802275804,
"pledgesAmountProcessed": 36.11248127960118,
"pledgesAmountTotal": 96.17510597010335,
},
"receivedPledges": 71.71677620866463,
"totalPledges": 88.38895264618175,
"receivedPledges": 79.3262861684276,
"totalPledges": 50.50755229029304,
},
Object {
"__typename": "CoachingAccountList",
"balance": 7.701867972597047,
"currency": "Onion Pocket",
"id": "5702668",
"monthlyGoal": 67,
"name": "Circle",
"balance": 20.84220615982889,
"currency": "EUR",
"id": "8465485",
"monthlyGoal": 73,
"name": "Egg Compass Rocket",
"primaryAppeal": Object {
"__typename": "CoachingAppeal",
"active": true,
"amount": 19.745889235377575,
"amountCurrency": "Bird Typewriter",
"id": "1270780",
"name": "Saddle Chisel Circle",
"pledgesAmountNotReceivedNotProcessed": 66.2952785316502,
"pledgesAmountProcessed": 18.199816964540847,
"pledgesAmountTotal": 72.72060834776661,
"amount": 57.02668130320204,
"amountCurrency": "CAD",
"id": "2268928",
"name": "Chess Board Mosquito",
"pledgesAmountNotReceivedNotProcessed": 11.708288466314501,
"pledgesAmountProcessed": 94.3774669075171,
"pledgesAmountTotal": 12.70780215832432,
},
"receivedPledges": 49.79264398185141,
"totalPledges": 54.25736018912712,
"receivedPledges": 22.600969051965148,
"totalPledges": 66.2952785316502,
},
Object {
"__typename": "CoachingAccountList",
"balance": 2.9079667684670696,
"currency": "Bible",
"id": "1688878",
"monthlyGoal": 23,
"name": "Onion Church Car",
"balance": 66.76403183825539,
"currency": "EUR",
"id": "1819981",
"monthlyGoal": 42,
"name": "Leather jacket Onion Pocket",
"primaryAppeal": Object {
"__typename": "CoachingAppeal",
"active": true,
"amount": 42.290111917719415,
"amountCurrency": "Necklace Prison",
"id": "761729",
"name": "Software Drum",
"pledgesAmountNotReceivedNotProcessed": 5.751591941256687,
"pledgesAmountProcessed": 71.27233959202866,
"pledgesAmountTotal": 88.88260916797685,
"amount": 7.701867972597047,
"amountCurrency": "CAD",
"id": "5425736",
"name": "Snail",
"pledgesAmountNotReceivedNotProcessed": 60.6603194388847,
"pledgesAmountProcessed": 22.219772841760978,
"pledgesAmountTotal": 16.959686277380897,
},
"receivedPledges": 90.38398155210061,
"totalPledges": 54.133712713605604,
"receivedPledges": 59.9470658594177,
"totalPledges": 67.6666019807398,
},
],
"pageInfo": Object {
"__typename": "PageInfo",
"endCursor": "Circus Map",
"endCursor": "Arm Bible Circus",
"hasNextPage": false,
"hasPreviousPage": false,
"startCursor": "Boy Wheelchair Data Base",
"hasPreviousPage": true,
"startCursor": "Drum Baby Rock",
},
"totalCount": 95,
"totalPageCount": 23,
"totalCount": 7,
"totalPageCount": 59,
}
`);
});
Expand Down
Loading
Loading