Skip to content

Fix/19987: Prioritize using name of policy from policy #20498

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

Merged
puneetlath merged 9 commits into from
Jun 20, 2023
Merged

Fix/19987: Prioritize using name of policy from policy #20498

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d3d77fe
fix: prioritize name of policy from policy
dukenv0307 Jun 9, 2023
b89e02a
fix: lint
dukenv0307 Jun 9, 2023
4708a64
fix: move comment
dukenv0307 Jun 12, 2023
736a492
fix: simplize logic
dukenv0307 Jun 13, 2023
0174740
fix: reset last commit
dukenv0307 Jun 13, 2023
351b5b5
fix: lint
dukenv0307 Jun 13, 2023
1e4c0ac
fix: remove repeated code
dukenv0307 Jun 13, 2023
776dab4
fix: simplize logic
dukenv0307 Jun 14, 2023
a089e8f
fix: lint
dukenv0307 Jun 14, 2023
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
17 changes: 5 additions & 12 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,22 +441,15 @@ function isArchivedRoom(report) {
* @returns {String}
*/
function getPolicyName(report) {
// Public rooms send back the policy name with the reportSummary,
// since they can also be accessed by people who aren't in the workspace
if (report.policyName) {
return report.policyName;
}

if (!allPolicies || _.size(allPolicies) === 0) {
if ((!allPolicies || _.size(allPolicies) === 0) && !report.policyName) {
return Localize.translateLocal('workspace.common.unavailable');
}
Comment on lines +444 to 446

@allroundexperts allroundexperts Jun 14, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed @dukenv0307?

@allroundexperts allroundexperts Jun 14, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see now that its needed. Else, we might show an old report name.

const policy = _.get(allPolicies, `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`);

const policy = allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
if (!policy) {
return report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');
}
// // Public rooms send back the policy name with the reportSummary,
// // since they can also be accessed by people who aren't in the workspace

return policy.name || report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');
return lodashGet(policy, 'name') || report.policyName || report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');
}

/**
Expand Down