Page MenuHomePhabricator
Differential D10065

[Flow202] Fix rebasing mistakes in D9984
ClosedPublic
Actions

Authored by ashoat on Nov 28 2023, 6:35 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 12, 8:37 PM
Unknown Object (File)
Mar 3 2025, 3:11 PM
Unknown Object (File)
Mar 1 2025, 12:36 PM
Unknown Object (File)
Feb 20 2025, 4:39 PM
Unknown Object (File)
Feb 20 2025, 4:39 PM
Unknown Object (File)
Feb 20 2025, 4:39 PM
Unknown Object (File)
Feb 20 2025, 4:39 PM
Unknown Object (File)
Feb 2 2025, 9:12 PM
View All 68 Files
Subscribers
tomek

Details

Reviewers
marcin
Commits
rCOMMf4e61ed90d7f: [Flow202] Fix rebasing mistakes in D9984
Summary

Context here. This was the accepted solution in D9984, but I accidentally undid it during rebasing.

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
flow-typed/
11 lines
web/
account/
4 lines
push-notif/
22 lines

Diff 33941

View Options

lib/flow-typed/web-crypto-common.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
parseThreadPermissionString, parseThreadPermissionString,
constructThreadPermissionString,
includeThreadPermissionForThreadType, includeThreadPermissionForThreadType,
} from './prefixes.js'; } from './prefixes.js';
import { import {
configurableCommunityPermissions, configurableCommunityPermissions,
threadPermissionFilterPrefixes, threadPermissionFilterPrefixes,
threadPermissionPropagationPrefixes, threadPermissionPropagationPrefixes,
threadPermissions, threadPermissions,
userSurfacedPermissions, userSurfacedPermissions,
▲ Show 20 Lines • Show All 148 Lines • ▼ Show 20 Lines if (!parsed.propagationPrefix) {
continue; continue;
} }
if ( if (
parsed.propagationPrefix === parsed.propagationPrefix ===
threadPermissionPropagationPrefixes.DESCENDANT threadPermissionPropagationPrefixes.DESCENDANT
) { ) {
permissionsForChildren[permissionKey] = permissionValue; permissionsForChildren[permissionKey] = permissionValue;
} }
const permissionWithFilterPrefix = parsed.filterPrefix const withoutPropagationPrefix = constructThreadPermissionString({
? `${parsed.filterPrefix}${parsed.permission}` ...parsed,
: parsed.permission; propagationPrefix: null,
permissionsForChildren[permissionWithFilterPrefix] = permissionValue; });
permissionsForChildren[withoutPropagationPrefix] = permissionValue;
} }
if (Object.keys(permissionsForChildren).length === 0) { if (Object.keys(permissionsForChildren).length === 0) {
return null; return null;
} }
return permissionsForChildren; return permissionsForChildren;
} }
function getRoleForPermissions( function getRoleForPermissions(
▲ Show 20 Lines • Show All 373 Lines • Show Last 20 Lines
View Options

web/account/account-hooks.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
parseThreadPermissionString, parseThreadPermissionString,
constructThreadPermissionString,
includeThreadPermissionForThreadType, includeThreadPermissionForThreadType,
} from './prefixes.js'; } from './prefixes.js';
import { import {
configurableCommunityPermissions, configurableCommunityPermissions,
threadPermissionFilterPrefixes, threadPermissionFilterPrefixes,
threadPermissionPropagationPrefixes, threadPermissionPropagationPrefixes,
threadPermissions, threadPermissions,
userSurfacedPermissions, userSurfacedPermissions,
▲ Show 20 Lines • Show All 148 Lines • ▼ Show 20 Lines if (!parsed.propagationPrefix) {
continue; continue;
} }
if ( if (
parsed.propagationPrefix === parsed.propagationPrefix ===
threadPermissionPropagationPrefixes.DESCENDANT threadPermissionPropagationPrefixes.DESCENDANT
) { ) {
permissionsForChildren[permissionKey] = permissionValue; permissionsForChildren[permissionKey] = permissionValue;
} }
const permissionWithFilterPrefix = parsed.filterPrefix const withoutPropagationPrefix = constructThreadPermissionString({
? `${parsed.filterPrefix}${parsed.permission}` ...parsed,
: parsed.permission; propagationPrefix: null,
permissionsForChildren[permissionWithFilterPrefix] = permissionValue; });
permissionsForChildren[withoutPropagationPrefix] = permissionValue;
} }
if (Object.keys(permissionsForChildren).length === 0) { if (Object.keys(permissionsForChildren).length === 0) {
return null; return null;
} }
return permissionsForChildren; return permissionsForChildren;
} }
function getRoleForPermissions( function getRoleForPermissions(
▲ Show 20 Lines • Show All 373 Lines • Show Last 20 Lines
View Options

web/push-notif/notif-crypto-utils.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
parseThreadPermissionString, parseThreadPermissionString,
constructThreadPermissionString,
includeThreadPermissionForThreadType, includeThreadPermissionForThreadType,
} from './prefixes.js'; } from './prefixes.js';
import { import {
configurableCommunityPermissions, configurableCommunityPermissions,
threadPermissionFilterPrefixes, threadPermissionFilterPrefixes,
threadPermissionPropagationPrefixes, threadPermissionPropagationPrefixes,
threadPermissions, threadPermissions,
userSurfacedPermissions, userSurfacedPermissions,
▲ Show 20 Lines • Show All 148 Lines • ▼ Show 20 Lines if (!parsed.propagationPrefix) {
continue; continue;
} }
if ( if (
parsed.propagationPrefix === parsed.propagationPrefix ===
threadPermissionPropagationPrefixes.DESCENDANT threadPermissionPropagationPrefixes.DESCENDANT
) { ) {
permissionsForChildren[permissionKey] = permissionValue; permissionsForChildren[permissionKey] = permissionValue;
} }
const permissionWithFilterPrefix = parsed.filterPrefix const withoutPropagationPrefix = constructThreadPermissionString({
? `${parsed.filterPrefix}${parsed.permission}` ...parsed,
: parsed.permission; propagationPrefix: null,
permissionsForChildren[permissionWithFilterPrefix] = permissionValue; });
permissionsForChildren[withoutPropagationPrefix] = permissionValue;
} }
if (Object.keys(permissionsForChildren).length === 0) { if (Object.keys(permissionsForChildren).length === 0) {
return null; return null;
} }
return permissionsForChildren; return permissionsForChildren;
} }
function getRoleForPermissions( function getRoleForPermissions(
▲ Show 20 Lines • Show All 373 Lines • Show Last 20 Lines