Сleanup UseLimitedView feature flag (#234)

* cleanup UseLimitedView feature flag
datalens-tech · Jan 17, 2025 · e92c4ab · e92c4ab
1 parent f35a595
commit e92c4ab
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 67 deletions.
diff --git a/src/components/features/types.ts b/src/components/features/types.ts
@@ -3,7 +3,6 @@ export enum Feature {
     CollectionsEnabled = 'CollectionsEnabled',
     ColorPalettesEnabled = 'ColorPalettesEnabled',
     UseIpV6 = 'UseIpV6',
-    UseLimitedView = 'UseLimitedView',
     WorkbookIsolationEnabled = 'WorkbookIsolationEnabled',
 }
 

diff --git a/src/configs/opensource/common.ts b/src/configs/opensource/common.ts
@@ -8,7 +8,6 @@ export const features: FeaturesConfig = {
     [Feature.CollectionsEnabled]: true,
     [Feature.ColorPalettesEnabled]: true,
     [Feature.UseIpV6]: false,
-    [Feature.UseLimitedView]: true,
     [Feature.WorkbookIsolationEnabled]: true,
 };
 

diff --git a/src/db/models/lock/index.ts b/src/db/models/lock/index.ts
@@ -4,7 +4,6 @@ import {DBError, transaction} from 'objection';
 import PG_ERRORS from 'pg-error-constants';
 
 import {Model} from '../..';
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {CURRENT_TIMESTAMP} from '../../../const';
 import US_ERRORS from '../../../const/us-error-constants';
 import {WorkbookPermission} from '../../../entities/workbook';
@@ -444,9 +443,7 @@ class Lock extends Model {
                 if (permission === 'edit') {
                     workbookPermission = WorkbookPermission.Update;
                 } else {
-                    workbookPermission = isEnabledFeature(ctx, Feature.UseLimitedView)
-                        ? WorkbookPermission.LimitedView
-                        : WorkbookPermission.View;
+                    workbookPermission = WorkbookPermission.LimitedView;
                 }
 
                 await checkWorkbookPermission({

diff --git a/src/services/entry/actions/create-in-workbook.ts b/src/services/entry/actions/create-in-workbook.ts
@@ -201,7 +201,6 @@ export async function createEntryInWorkbook(
 
     if (includePermissionsInfo) {
         permissions = getEntryPermissionsByWorkbook({
-            ctx,
             workbook,
             scope: resultEntry.scope,
         });

diff --git a/src/services/entry/actions/get-entry-relations.ts b/src/services/entry/actions/get-entry-relations.ts
@@ -141,7 +141,6 @@ export async function getEntryRelations(
                 return {
                     ...item,
                     permissions: getEntryPermissionsByWorkbook({
-                        ctx,
                         workbook,
                         scope: item.scope,
                     }),

diff --git a/src/services/new/collection/get-collection-breadcrumbs.ts b/src/services/new/collection/get-collection-breadcrumbs.ts
@@ -1,6 +1,5 @@
 import {AppError} from '@gravity-ui/nodekit';
 
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {US_ERRORS} from '../../../const';
 import {CollectionPermission} from '../../../entities/collection';
 import Utils from '../../../utils';
@@ -59,9 +58,7 @@ export const getCollectionBreadcrumbs = async (
 
                 await collectionInstance.checkPermission({
                     parentIds,
-                    permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                        ? CollectionPermission.LimitedView
-                        : CollectionPermission.View,
+                    permission: CollectionPermission.LimitedView,
                 });
 
                 if (includePermissionsInfo) {

diff --git a/src/services/new/collection/get-collection-content.ts b/src/services/new/collection/get-collection-content.ts
@@ -1,6 +1,5 @@
 import {AppError} from '@gravity-ui/nodekit';
 
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {US_ERRORS} from '../../../const';
 import {CollectionModel, CollectionModelColumn} from '../../../db/models/new/collection';
 import {CollectionPermission} from '../../../entities/collection';
@@ -93,9 +92,7 @@ export const getCollectionContent = async (
 
             await collection.checkPermission({
                 parentIds,
-                permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                    ? CollectionPermission.LimitedView
-                    : CollectionPermission.View,
+                permission: CollectionPermission.LimitedView,
             });
         }
     }
@@ -149,9 +146,7 @@ export const getCollectionContent = async (
                         try {
                             await collection.checkPermission({
                                 parentIds: contentParentIds,
-                                permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                                    ? CollectionPermission.LimitedView
-                                    : CollectionPermission.View,
+                                permission: CollectionPermission.LimitedView,
                             });
 
                             return collection;

diff --git a/src/services/new/collection/get-collections-list-by-ids.ts b/src/services/new/collection/get-collections-list-by-ids.ts
@@ -1,4 +1,3 @@
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {CollectionModel, CollectionModelColumn} from '../../../db/models/new/collection';
 import {CollectionPermission} from '../../../entities/collection';
 import {CollectionInstance} from '../../../registry/common/entities/collection/types';
@@ -60,9 +59,7 @@ export const getCollectionsListByIds = async (
         const promise = collection
             .checkPermission({
                 parentIds,
-                permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                    ? CollectionPermission.LimitedView
-                    : CollectionPermission.View,
+                permission: CollectionPermission.LimitedView,
             })
             .then(() => {
                 acceptedCollectionsMap.set(collection.model, parentIds);

diff --git a/src/services/new/collection/utils/check-and-set-collections-permission.ts b/src/services/new/collection/utils/check-and-set-collections-permission.ts
@@ -1,4 +1,3 @@
-import {Feature, isEnabledFeature} from '../../../../components/features';
 import {CollectionPermission} from '../../../../entities/collection';
 import {CollectionInstance} from '../../../../registry/common/entities/collection/types';
 import {ServiceArgs} from '../../types';
@@ -38,10 +37,8 @@ export const checkAndSetCollectionPermission = async (
 
         if (permission) {
             localPermission = permission;
-        } else if (isEnabledFeature(ctx, Feature.UseLimitedView)) {
-            localPermission = CollectionPermission.LimitedView;
         } else {
-            localPermission = CollectionPermission.View;
+            localPermission = CollectionPermission.LimitedView;
         }
 
         if (collectionInstance.model.parentId !== null) {

diff --git a/src/services/new/entry/get-entry-by-key.ts b/src/services/new/entry/get-entry-by-key.ts
@@ -125,7 +125,6 @@ export const getEntryByKey = async (
 
                 if (includePermissionsInfo) {
                     iamPermissions = getEntryPermissionsByWorkbook({
-                        ctx,
                         workbook,
                         scope: joinedEntryRevision[EntryColumn.Scope],
                     });

diff --git a/src/services/new/entry/get-entry.ts b/src/services/new/entry/get-entry.ts
@@ -147,7 +147,6 @@ export const getEntry = async (
 
                 if (includePermissionsInfo) {
                     iamPermissions = getEntryPermissionsByWorkbook({
-                        ctx,
                         workbook,
                         scope: joinedEntryRevisionFavorite[EntryColumn.Scope],
                     });

diff --git a/src/services/new/entry/utils/filter-entries-by-permission.ts b/src/services/new/entry/utils/filter-entries-by-permission.ts
@@ -104,7 +104,6 @@ export const filterEntriesByPermission = async <T extends PartialEntry>(
 
                     if (workbook) {
                         const permissions = getEntryPermissionsByWorkbook({
-                            ctx,
                             workbook,
                             scope: entry.scope,
                         });

diff --git a/src/services/new/structure-item/get-structure-items.ts b/src/services/new/structure-item/get-structure-items.ts
@@ -1,4 +1,3 @@
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {makeSchemaValidator} from '../../../components/validation-schema-compiler';
 import {CollectionModel} from '../../../db/models/new/collection';
 import {CollectionPermission} from '../../../entities/collection';
@@ -118,9 +117,7 @@ export const getStructureItems = async (
 
             await collection.checkPermission({
                 parentIds,
-                permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                    ? CollectionPermission.LimitedView
-                    : CollectionPermission.View,
+                permission: CollectionPermission.LimitedView,
             });
         }
     }

diff --git a/src/services/new/structure-item/utils.ts b/src/services/new/structure-item/utils.ts
@@ -1,7 +1,6 @@
 import {AppContext, AppError} from '@gravity-ui/nodekit';
 import {raw} from 'objection';
 
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {US_ERRORS} from '../../../const';
 import {CollectionModel, CollectionModelColumn} from '../../../db/models/new/collection';
 import {WorkbookModel, WorkbookModelColumn} from '../../../db/models/new/workbook';
@@ -140,16 +139,12 @@ export const processPermissions = async ({
                     if (isWorkbookInstance(item)) {
                         await item.checkPermission({
                             parentIds,
-                            permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                                ? WorkbookPermission.LimitedView
-                                : WorkbookPermission.View,
+                            permission: WorkbookPermission.LimitedView,
                         });
                     } else {
                         await item.checkPermission({
                             parentIds,
-                            permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                                ? CollectionPermission.LimitedView
-                                : CollectionPermission.View,
+                            permission: CollectionPermission.LimitedView,
                         });
                     }
 

diff --git a/src/services/new/workbook/get-workbook-content.ts b/src/services/new/workbook/get-workbook-content.ts
@@ -1,4 +1,3 @@
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {makeSchemaValidator} from '../../../components/validation-schema-compiler';
 import {DEFAULT_PAGE, DEFAULT_PAGE_SIZE} from '../../../const';
 import {EntryScope} from '../../../db/models/new/entry/types';
@@ -131,7 +130,7 @@ export const getWorkbookContent = async (
                 isDeleted: false,
             });
 
-            if (isEnabledFeature(ctx, Feature.UseLimitedView) && !workbook.permissions?.view) {
+            if (!workbook.permissions?.view) {
                 builder.whereNotIn('scope', ['dataset', 'connection']);
             }
             if (createdBy) {
@@ -178,7 +177,6 @@ export const getWorkbookContent = async (
 
         if (includePermissionsInfo) {
             permissions = getEntryPermissionsByWorkbook({
-                ctx,
                 workbook,
                 scope: entry.scope,
             });

diff --git a/src/services/new/workbook/get-workbook.ts b/src/services/new/workbook/get-workbook.ts
@@ -1,6 +1,5 @@
 import {AppError} from '@gravity-ui/nodekit';
 
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {makeSchemaValidator} from '../../../components/validation-schema-compiler';
 import {US_ERRORS} from '../../../const';
 import {WorkbookModel, WorkbookModelColumn} from '../../../db/models/new/workbook';
@@ -93,9 +92,7 @@ export const getWorkbook = async <T extends WorkbookInstance = WorkbookInstance>
 
         await workbook.checkPermission({
             parentIds,
-            permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                ? WorkbookPermission.LimitedView
-                : WorkbookPermission.View,
+            permission: WorkbookPermission.LimitedView,
         });
 
         if (includePermissionsInfo) {

diff --git a/src/services/new/workbook/get-workbooks-list-by-ids.ts b/src/services/new/workbook/get-workbooks-list-by-ids.ts
@@ -1,4 +1,3 @@
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {makeSchemaValidator} from '../../../components/validation-schema-compiler';
 import {WorkbookModel, WorkbookModelColumn} from '../../../db/models/new/workbook';
 import {WorkbookPermission} from '../../../entities/workbook';
@@ -82,9 +81,7 @@ export const getWorkbooksListByIds = async (
         const promise = workbook
             .checkPermission({
                 parentIds,
-                permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                    ? WorkbookPermission.LimitedView
-                    : WorkbookPermission.View,
+                permission: WorkbookPermission.LimitedView,
             })
             .then(() => {
                 acceptedWorkbooksMap.set(workbook.model, parentIds);

diff --git a/src/services/new/workbook/get-workbooks-list.ts b/src/services/new/workbook/get-workbooks-list.ts
@@ -1,6 +1,5 @@
 import {AppError} from '@gravity-ui/nodekit';
 
-import {Feature, isEnabledFeature} from '../../../components/features';
 import {makeSchemaValidator} from '../../../components/validation-schema-compiler';
 import {DEFAULT_PAGE, DEFAULT_PAGE_SIZE, US_ERRORS} from '../../../const';
 import {CollectionModel} from '../../../db/models/new/collection';
@@ -123,9 +122,7 @@ export const getWorkbooksList = async (
 
             await collection.checkPermission({
                 parentIds: parents.slice(1).map((model) => model.collectionId),
-                permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                    ? CollectionPermission.LimitedView
-                    : CollectionPermission.View,
+                permission: CollectionPermission.LimitedView,
             });
         }
     }
@@ -177,9 +174,7 @@ export const getWorkbooksList = async (
                     try {
                         await workbook.checkPermission({
                             parentIds,
-                            permission: isEnabledFeature(ctx, Feature.UseLimitedView)
-                                ? WorkbookPermission.LimitedView
-                                : WorkbookPermission.View,
+                            permission: WorkbookPermission.LimitedView,
                         });
 
                         return workbook;

diff --git a/src/services/new/workbook/utils/get-entry-permissions-by-workbook.ts b/src/services/new/workbook/utils/get-entry-permissions-by-workbook.ts
@@ -1,25 +1,18 @@
-import {AppContext} from '@gravity-ui/nodekit';
-
-import {Feature, isEnabledFeature} from '../../../../components/features';
 import {EntryScope} from '../../../../db/models/new/entry/types';
 import {Permissions} from '../../../../entities/workbook';
 import type {WorkbookInstance} from '../../../../registry/common/entities/workbook/types';
 import type {EntryScope as EntryScopeType} from '../../../../types/models';
 
 export const getEntryPermissionsByWorkbook = ({
-    ctx,
     workbook,
     scope,
 }: {
-    ctx: AppContext;
     workbook: WorkbookInstance;
     scope?: EntryScopeType | null;
 }) => {
     const permissions = workbook.permissions as Permissions;
 
-    const view = isEnabledFeature(ctx, Feature.UseLimitedView)
-        ? permissions.limitedView
-        : permissions.view;
+    const view = permissions.limitedView;
 
     const mappedPermission = {
         execute: view,