simplify code for getting labels for permission checkboxes

Author: magicznyleszek

jsapp/js/components/permissions/userAssetPermsEditor.component.tsx

@@ -17,6 +17,7 @@ import {
   CHECKBOX_NAMES,
   CHECKBOX_PERM_PAIRS,
   PARTIAL_IMPLIED_CHECKBOX_PAIRS,
+  CHECKBOX_LABELS,
 } from './permConstants';
 import type {
   CheckboxNameAll,
@@ -27,7 +28,7 @@ import type {
 import type {AssignablePermsMap} from './sharingForm.component';
 import type {PermissionBase} from 'js/dataInterface';
 import userExistence from 'js/users/userExistence.store';
-import {getPartialByUsersListName, getCheckboxLabel} from './utils';
+import {getPartialByUsersListName} from './utils';
 
 const PARTIAL_PLACEHOLDER = t('Enter usernames separated by comma');
 const USERNAMES_SEPARATOR = ',';
@@ -513,7 +514,7 @@ export default class UserAssetPermsEditor extends React.Component<
         checked={this.state[checkboxName]}
         disabled={isDisabled}
         onChange={this.onCheckboxChange.bind(this, checkboxName)}
-        label={getCheckboxLabel(checkboxName)}
+        label={CHECKBOX_LABELS[checkboxName]}
       />
     );
   }

jsapp/js/components/permissions/utils.ts

@@ -256,17 +256,6 @@ export function getCheckboxNameByPermission(
   return found;
 }
 
-/**
- * A wrapper function for getting item from `CHECKBOX_LABELS`. If anything goes
- * awry, we will return checkbox name as fallback.
- */
-export function getCheckboxLabel(checkboxName: CheckboxNameAll) {
-  if (checkboxName in CHECKBOX_LABELS) {
-    return CHECKBOX_LABELS[checkboxName];
-  }
-  return checkboxName;
-}
-
 /** Detects if partial permissions is of "by users" kind */
 export function isPartialByUsers(perm: UserPerm) {
   // TODO for now this only checks if this is partial permission, as there is
@@ -296,8 +285,8 @@ export function getPermLabel(perm: UserPerm) {
   if (permDef) {
     const checkboxName = getCheckboxNameByPermission(permDef.codename);
 
-    if (checkboxName && checkboxName in CHECKBOX_LABELS) {
-      return getCheckboxLabel(checkboxName);
+    if (checkboxName) {
+      return CHECKBOX_LABELS[checkboxName];
     }
   }