fix: code-review

ydb-platform · Jul 2, 2024 · 9aabcf1 · 9aabcf1
1 parent 8b3935c
commit 9aabcf1
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 42 deletions.
diff --git a/src/containers/Tenant/Acl/Acl.scss b/src/containers/Tenant/Acl/Acl.scss
@@ -6,15 +6,8 @@
         padding-bottom: 16px;
     }
 
-    &__owner-container {
-        position: sticky;
-        z-index: 2;
-        top: 0;
-
-        width: 100%;
-        padding-bottom: 16px;
-
-        background-color: var(--g-color-base-background);
+    &__owner {
+        font-weight: 600;
     }
     &__definition-content {
         display: flex;

diff --git a/src/containers/Tenant/Acl/Acl.tsx b/src/containers/Tenant/Acl/Acl.tsx
@@ -25,25 +25,30 @@ const prepareLogin = (value: string | undefined) => {
 
 const aclParams = ['access', 'type', 'inheritance'] as const;
 
-const aclParamToName: Record<(typeof aclParams)[number], string> = {
+type AclParameter = (typeof aclParams)[number];
+
+const aclParamToName: Record<AclParameter, string> = {
     access: 'Access',
     type: 'Access type',
     inheritance: 'Inheritance type',
 };
 
-const defaultInheritanceType = new Set(['Object', 'Container']);
+const defaultInheritanceType = ['Object', 'Container'];
+const defaultAccessType = 'Allow';
+
+const defaultInheritanceTypeSet = new Set(defaultInheritanceType);
 
 function normalizeAcl(acl: TACE[]) {
     return acl.map((ace) => {
         const {AccessRules = [], AccessRights = [], AccessType, InheritanceType, Subject} = ace;
         const access = AccessRules.concat(AccessRights);
         //"Allow" is default access type. We want to show it only if it isn't default
-        const type = AccessType === 'Allow' ? undefined : AccessType;
+        const type = AccessType === defaultAccessType ? undefined : AccessType;
         let inheritance;
         // ['Object', 'Container'] - is default inheritance type. We want to show it only if it isn't default
         if (
-            InheritanceType?.length !== defaultInheritanceType.size ||
-            InheritanceType.some((t) => !defaultInheritanceType.has(t))
+            InheritanceType?.length !== defaultInheritanceTypeSet.size ||
+            InheritanceType.some((t) => !defaultInheritanceTypeSet.has(t))
         ) {
             inheritance = InheritanceType;
         }
@@ -56,6 +61,21 @@ function normalizeAcl(acl: TACE[]) {
     });
 }
 
+interface DefinitionValueProps {
+    value: string | string[];
+}
+
+function DefinitionValue({value}: DefinitionValueProps) {
+    const normalizedValue = typeof value === 'string' ? [value] : value;
+    return (
+        <div className={b('definition-content')}>
+            {normalizedValue.map((el) => (
+                <span key={el}>{el}</span>
+            ))}
+        </div>
+    );
+}
+
 export const Acl = ({path}: {path: string}) => {
     const {currentData, isFetching, error} = schemaAclApi.useGetSchemaAclQuery({path});
 
@@ -70,44 +90,42 @@ export const Acl = ({path}: {path: string}) => {
         const normalizedAcl = normalizeAcl(acl);
 
         const items = normalizedAcl.map(({Subject, ...data}) => {
+            const definedDataEntries = Object.entries(data).filter(([_key, value]) => value) as [
+                AclParameter,
+                string | string[],
+            ][];
+
+            if (definedDataEntries.length === 1 && definedDataEntries[0][0] === 'access') {
+                return {
+                    name: Subject,
+                    content: <DefinitionValue value={definedDataEntries[0][1]} />,
+                };
+            }
+            const definedData = Object.fromEntries(definedDataEntries);
             return {
                 label: Subject,
                 items: aclParams
                     .map((key) => {
-                        const value = data[key];
-                        if (!value) {
-                            return undefined;
-                        }
-                        const normalizedValue = typeof value === 'string' ? [value] : value;
+                        const value = definedData[key];
                         return {
                             name: aclParamToName[key],
-                            content: (
-                                <div className={b('definition-content')}>
-                                    {normalizedValue.map((el) => (
-                                        <span key={el}>{el}</span>
-                                    ))}
-                                </div>
-                            ),
+                            content: <DefinitionValue value={value} />,
                         };
                     })
                     .filter(Boolean),
             };
         }) as DefinitionListItem[];
 
-        return <DefinitionList items={items} nameMaxWidth={200} />;
-    };
+        const preparedOwner = prepareLogin(owner);
 
-    const renderOwner = () => {
-        if (!owner) {
-            return null;
+        if (preparedOwner) {
+            items.unshift({
+                name: <span className={b('owner')}>{preparedOwner}</span>,
+                content: <span className={b('owner')}>{i18n('acl.owner')}</span>,
+            });
         }
 
-        return (
-            <div className={b('owner-container')}>
-                <span className={b('owner-label')}>{`${i18n('acl.owner')}: `}</span>
-                {prepareLogin(owner)}
-            </div>
-        );
+        return <DefinitionList items={items} nameMaxWidth={200} />;
     };
 
     if (loading) {
@@ -124,10 +142,7 @@ export const Acl = ({path}: {path: string}) => {
 
     return (
         <div className={b()}>
-            <div className={b('result')}>
-                {renderOwner()}
-                {renderTable()}
-            </div>
+            <div className={b('result')}>{renderTable()}</div>
         </div>
     );
 };
diff --git a/src/types/api/acl.ts b/src/types/api/acl.ts
@@ -22,5 +22,5 @@ export interface TACE {
     AccessRules?: string[];
     Subject: string;
     InheritanceType?: string[];
-    AccessRule: string;
+    AccessRule?: string;
 }