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

fix: remove broken usage of useCache from getSubsidyRequestConfiguration #1030

Merged
merged 1 commit into from
Sep 14, 2023
Merged

fix: remove broken usage of useCache from getSubsidyRequestConfiguration #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dist/

# emacs
*~
.projectile

# edx
.env.private
Expand Down
29 changes: 13 additions & 16 deletions src/components/subsidy-requests/data/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,18 @@ export const useSubsidyRequestConfiguration = ({
}
}, [enterpriseId]);

const loadSubsidyRequestConfiguration = useCallback(
async ({ clearCacheEntry = false } = { clearCacheEntry: false }) => {
try {
const response = await EnterpriseAccessApiService.getSubsidyRequestConfiguration(
{ enterpriseId, clearCacheEntry },
);
const customerConfiguration = camelCaseObject(response.data);
setSubsidyRequestConfiguration(customerConfiguration);
} catch (error) {
logError(error);
throw error;
}
},
[enterpriseId],
);
const loadSubsidyRequestConfiguration = useCallback(async () => {
try {
const response = await EnterpriseAccessApiService.getSubsidyRequestConfiguration(
{ enterpriseId },
);
const customerConfiguration = camelCaseObject(response.data);
setSubsidyRequestConfiguration(customerConfiguration);
} catch (error) {
logError(error);
throw error;
}
}, [enterpriseId]);

useEffect(() => {
if (!enterpriseId) {
Expand Down Expand Up @@ -111,7 +108,7 @@ export const useSubsidyRequestConfiguration = ({
enterpriseId,
options,
);
loadSubsidyRequestConfiguration({ clearCacheEntry: true });
loadSubsidyRequestConfiguration();
} catch (err) {
logError(err);
throw err;
Expand Down
4 changes: 2 additions & 2 deletions src/components/subsidy-requests/data/tests/hooks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe('useSubsidyRequestConfiguration', () => {
await waitForNextUpdate();

expect(EnterpriseAccessApiService.getSubsidyRequestConfiguration).toHaveBeenCalledWith(
{ clearCacheEntry: false, enterpriseId: TEST_ENTERPRISE_UUID },
{ enterpriseId: TEST_ENTERPRISE_UUID },
);
expect(result.current.subsidyRequestConfiguration).toEqual(
camelCaseObject(TEST_CONFIGURATION_RESPONSE.data),
Expand Down Expand Up @@ -230,7 +230,7 @@ describe('useSubsidyRequestConfiguration', () => {
});

expect(EnterpriseAccessApiService.getSubsidyRequestConfiguration).toHaveBeenCalledWith(
{ clearCacheEntry: true, enterpriseId: TEST_ENTERPRISE_UUID },
{ enterpriseId: TEST_ENTERPRISE_UUID },
);
});

Expand Down
6 changes: 2 additions & 4 deletions src/data/services/EnterpriseAccessApiService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ class EnterpriseAccessApiService {

static apiClient = getAuthenticatedHttpClient;

static getSubsidyRequestConfiguration({ enterpriseId, clearCacheEntry = false }) {
static getSubsidyRequestConfiguration({ enterpriseId }) {
const url = `${EnterpriseAccessApiService.baseUrl}/customer-configurations/${enterpriseId}/`;
return EnterpriseAccessApiService.apiClient({
useCache: configuration.USE_API_CACHE,
}).get(url, { clearCacheEntry });
return EnterpriseAccessApiService.apiClient().get(url);
}

static createSubsidyRequestConfiguration({
Expand Down
1 change: 0 additions & 1 deletion src/data/services/tests/EnterpriseAccessApiService.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ describe('EnterpriseAccessApiService', () => {
EnterpriseAccessApiService.getSubsidyRequestConfiguration({ enterpriseId: mockEnterpriseUUID });
expect(axios.get).toBeCalledWith(
`${enterpriseAccessBaseUrl}/api/v1/customer-configurations/${mockEnterpriseUUID}/`,
{ clearCacheEntry: false },
);
});

Expand Down
Loading