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

Updated code to remove dependency on IS_LOADING_POLICY_DATA for Welcome.js #11627

Merged
merged 7 commits into from
Oct 20, 2022
Merged

Updated code to remove dependency on IS_LOADING_POLICY_DATA for Welcome.js #11627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc1669c
updated code to include status of loading policy data
techievivek Oct 6, 2022
264f9bc
updated code to remove loading policy data flag for Welecome.js
techievivek Oct 10, 2022
6406b54
Merge branch 'main' into techievivek_workspace_chat_for_first_time_user
techievivek Oct 10, 2022
6b08625
removed getPolicyList and key IS_LOADING_POLICY_DATA
techievivek Oct 12, 2022
9aec997
fixed linter
techievivek Oct 12, 2022
321990e
fixed loading of reports in policy case
techievivek Oct 13, 2022
59f7091
Merge branch 'main' into techievivek_workspace_chat_for_first_time_user
techievivek Oct 19, 2022
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
3 changes: 0 additions & 3 deletions src/ONYXKEYS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ export default {
// Is report data loading?
IS_LOADING_REPORT_DATA: 'isLoadingReportData',

// Is policy data loading?
IS_LOADING_POLICY_DATA: 'isLoadingPolicyData',

// Is Keyboard shortcuts modal open?
IS_SHORTCUTS_MODAL_OPEN: 'isShortcutsModalOpen',

Expand Down
55 changes: 0 additions & 55 deletions src/libs/actions/Policy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,26 +99,6 @@ function updateLastAccessedWorkspace(policyID) {
Onyx.set(ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID, policyID);
}

/**
* Used to update ALL of the policies at once. If a policy is present locally, but not in the policies object passed here it will be removed.
* @param {Object} policyCollection - object of policy key and partial policy object
*/
function updateAllPolicies(policyCollection) {
// Clear out locally cached policies that have been deleted (i.e. they exist locally but not in our new policy collection object)
_.each(allPolicies, (policy, key) => {
if (policyCollection[key]) {
return;
}

Onyx.set(key, null);
});

// Set all the policies
_.each(policyCollection, (policyData, key) => {
Onyx.merge(key, {...policyData, alertMessage: '', errors: null});
});
}

/**
* Delete the workspace
*
Expand Down Expand Up @@ -168,40 +148,6 @@ function deleteWorkspace(policyID, reports) {
}
}

/**
* Fetches policy list from the API and saves a simplified version in Onyx, optionally creating a new policy first.
*
* More specifically, this action will:
* 1. Optionally create a new policy.
* 2. Fetch policy summaries.
* 3. Optionally navigate to the new policy.
* 4. Then fetch full policies.
*
* This way, we ensure that there's no race condition between creating the new policy and fetching existing ones,
* and we also don't have to wait for full policies to load before navigating to the new policy.
*/
function getPolicyList() {
Onyx.set(ONYXKEYS.IS_LOADING_POLICY_DATA, true);
DeprecatedAPI.GetPolicySummaryList()
.then((data) => {
if (data.jsonCode !== 200) {
Onyx.set(ONYXKEYS.IS_LOADING_POLICY_DATA, false);
return;
}

const policyCollection = _.reduce(data.policySummaryList, (memo, policy) => ({
...memo,
[`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: getSimplifiedPolicyObject(policy, false),
}), {});

if (!_.isEmpty(policyCollection)) {
updateAllPolicies(policyCollection);
}

Onyx.set(ONYXKEYS.IS_LOADING_POLICY_DATA, false);
});
}

/**
* @param {String} policyID
*/
Expand Down Expand Up @@ -978,7 +924,6 @@ function openWorkspaceInvitePage(policyID, clientMemberEmails) {
}

export {
getPolicyList,
loadFullPolicy,
removeMembers,
addMembersToWorkspace,
Expand Down
14 changes: 2 additions & 12 deletions src/libs/actions/Welcome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ let isReadyPromise = new Promise((resolve) => {

let isFirstTimeNewExpensifyUser;
let isLoadingReportData = true;
let isLoadingPolicyData = true;
let email = '';

/**
Expand All @@ -28,7 +27,7 @@ let email = '';
* - Whether we have loaded all reports the server knows about
*/
function checkOnReady() {
if (!_.isBoolean(isFirstTimeNewExpensifyUser) || isLoadingPolicyData || isLoadingReportData) {
if (!_.isBoolean(isFirstTimeNewExpensifyUser) || isLoadingReportData) {
return;
}

Expand All @@ -53,15 +52,6 @@ Onyx.connect({
},
});

Onyx.connect({
key: ONYXKEYS.IS_LOADING_POLICY_DATA,
initWithStoredValues: false,
callback: (val) => {
isLoadingPolicyData = val;
checkOnReady();
},
});

const allReports = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT,
Expand All @@ -77,7 +67,7 @@ Onyx.connect({

const allPolicies = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT,
key: ONYXKEYS.COLLECTION.POLICY,
callback: (val, key) => {
if (!val || !key) {
return;
Expand Down