fix: resolve rebase issues

libs/api-client-tiger/api/api-client-tiger.api.md

@@ -7326,8 +7326,6 @@ export interface IUserProfile {
     // (undocumented)
     organizationName: string;
     // (undocumented)
-    permissions?: string[];
-    // (undocumented)
     userId: string;
 }
 

libs/api-client-tiger/src/index.ts

@@ -201,38 +201,6 @@ export {
     ActionsApiFetchClusteringResultRequest,
     ActionsApiFetchForecastResultRequest,
     DependsOn,
-    AnomalyDetectionRequest,
-    ClusteringRequest,
-    ForecastRequest,
-    KeyDriversRequest,
-    ActionsApiGetAnomalyDetectionResultRequest,
-    AnomalyDetectionResult,
-    ActionsApiGetClusteringResultRequest,
-    ClusteringResult,
-    ActionsApiGetForecastResultRequest,
-    ForecastResult,
-    ActionsApiGetResultRequest,
-    KeyDriversResult,
-    ActionsApiProcessAnomalyDetectionRequest,
-    MachineLearningResponse,
-    ActionsApiProcessClusteringRequestRequest,
-    ActionsApiProcessForecastRequestRequest,
-    ActionsApiProcessKeyDriversRequestRequest,
-    KeyDriversResponse,
-    KeyDriversDimension,
-    KeyDriversRequestSortDirectionEnum,
-    KeyDriversDimensionGranularityEnum,
-    ClusteringResultValue,
-    ActionsApiCacheAnomalyDetectionResultRequest,
-    CacheResponse,
-    ActionsApiCacheClusteringResultRequest,
-    ActionsApiCacheForecastResultRequest,
-    ActionsApiDeleteAnomalyDetectionResultRequest,
-    ActionsApiDeleteClusteringResultRequest,
-    ActionsApiDeleteForecastResultRequest,
-    ActionsApiFetchAnomalyDetectionResultRequest,
-    ActionsApiFetchClusteringResultRequest,
-    ActionsApiFetchForecastResultRequest,
 } from "./generated/afm-rest-api/api.js";
 export {
     ActionsApiFactory as AuthActionsApiFactory,

libs/sdk-backend-spi/api/sdk-backend-spi.api.md

@@ -56,6 +56,7 @@ import { IMeasureMetadataObjectDefinition } from '@gooddata/sdk-model';
 import { IMetadataObject } from '@gooddata/sdk-model';
 import { INullableFilter } from '@gooddata/sdk-model';
 import { IOrganizationDescriptor } from '@gooddata/sdk-model';
+import { IOrganizationPermissionAssignment } from '@gooddata/sdk-model';
 import { IOrganizationUser } from '@gooddata/sdk-model';
 import { IOrganizationUserGroup } from '@gooddata/sdk-model';
 import { IRelativeDateFilter } from '@gooddata/sdk-model';
@@ -561,11 +562,8 @@ export interface IOrganizationPermissionService {
     getOrganizationPermissionForUserGroup(userGroupId: string): Promise<OrganizationPermissionAssignment[]>;
     getWorkspacePermissionsForUser(userId: string): Promise<IWorkspacePermissionAssignment[]>;
     getWorkspacePermissionsForUserGroup(userGroupId: string): Promise<IWorkspacePermissionAssignment[]>;
-    updateUserOrganizationAdminStatus(userId: string, isOrganizationAdmin: boolean): Promise<void>;
-    updateWorkspacePermissionsForUser(userId: string, permissions: IWorkspacePermissionAssignment[]): Promise<void>;
-    updateWorkspacePermissionsForUserGroup(userGroupId: string, permissions: IWorkspacePermissionAssignment[]): Promise<void>;
-    updateWorkspacePermissionsForUserGroups(userGroupIds: string[], permissions: IWorkspacePermissionAssignment[]): Promise<void>;
-    updateWorkspacePermissionsForUsers(userIds: string[], permissions: IWorkspacePermissionAssignment[]): Promise<void>;
+    updateOrganizationPermissions(permissionAssignments: IOrganizationPermissionAssignment[]): Promise<void>;
+    updateWorkspacePermissions(permissions: IWorkspacePermissionAssignment[]): Promise<void>;
 }
 
 // @public
@@ -607,12 +605,8 @@ export interface IOrganizationStylingService {
 
 // @alpha
 export interface IOrganizationUserService {
-    addUserGroupsToUsers(userGroupIds: string[], userIds: string[]): Promise<void>;
-    addUserGroupToUsers(userGroupId: string, userIds: string[]): Promise<void>;
-    addUserToUserGroups(userId: string, userGroupIds: string[]): Promise<void>;
+    addUsersToUserGroups(userIds: string[], userGroupIds: string[]): Promise<void>;
     createUserGroup(group: IUserGroup): Promise<void>;
-    deleteUser(id: string): Promise<void>;
-    deleteUserGroup(id: string): Promise<void>;
     deleteUserGroups(ids: string[]): Promise<void>;
     deleteUsers(ids: string[]): Promise<void>;
     getUser(id: string): Promise<IUser | undefined>;
@@ -621,7 +615,7 @@ export interface IOrganizationUserService {
     getUserGroupsOfUser(userId: string): Promise<IUserGroup[]>;
     getUsers(): Promise<IOrganizationUser[]>;
     getUsersOfUserGroup(userGroupId: string): Promise<IUser[]>;
-    removeUserFromUserGroup(userId: string, userGroupId: string): Promise<void>;
+    removeUsersFromUserGroups(userIds: string[], userGroupIds: string[]): Promise<void>;
     updateUser(user: IUser): Promise<void>;
     updateUserGroup(group: IUserGroup): Promise<void>;
 }

libs/sdk-backend-tiger/api/sdk-backend-tiger.api.md

@@ -16,8 +16,6 @@ import { ClusteringResult } from '@gooddata/api-client-tiger';
 import { DataSourceParameter } from '@gooddata/api-client-tiger';
 import { DeclarativeAnalytics } from '@gooddata/api-client-tiger';
 import { DeclarativeModel } from '@gooddata/api-client-tiger';
-import { DeclarativePdm } from '@gooddata/api-client-tiger';
-import { DeclarativeTables } from '@gooddata/api-client-tiger';
 import { DeclarativeWorkspaceDataFilters } from '@gooddata/api-client-tiger';
 import { DependentEntitiesRequest } from '@gooddata/api-client-tiger';
 import { DependentEntitiesResponse } from '@gooddata/api-client-tiger';
@@ -36,7 +34,6 @@ import { IMeasure } from '@gooddata/sdk-model';
 import { ITigerClient } from '@gooddata/api-client-tiger';
 import { IUser } from '@gooddata/sdk-model';
 import { IWidgetAlert } from '@gooddata/sdk-model';
-import { IWorkspaceUser } from '@gooddata/sdk-model';
 import { JsonApiAnalyticalDashboardOutMetaOrigin } from '@gooddata/api-client-tiger';
 import { JsonApiDatasetOutList } from '@gooddata/api-client-tiger';
 import { JsonApiDataSourceInAttributesTypeEnum } from '@gooddata/api-client-tiger';
@@ -48,7 +45,6 @@ import { JsonApiWorkspaceDataFilterSettingInDocument } from '@gooddata/api-clien
 import { JsonApiWorkspaceDataFilterSettingOutDocument } from '@gooddata/api-client-tiger';
 import { JsonApiWorkspaceInDocument } from '@gooddata/api-client-tiger';
 import { LayoutApiPutWorkspaceLayoutRequest } from '@gooddata/api-client-tiger';
-import { LayoutApiSetPdmLayoutRequest } from '@gooddata/api-client-tiger';
 import { NotAuthenticated } from '@gooddata/sdk-backend-spi';
 import { NotAuthenticatedHandler } from '@gooddata/sdk-backend-spi';
 import { ObjectType } from '@gooddata/sdk-model';
@@ -58,7 +54,6 @@ import { Recommendation } from '@gooddata/api-client-tiger';
 import { ScanSqlResponse } from '@gooddata/api-client-tiger';
 import { TestDefinitionRequestTypeEnum } from '@gooddata/api-client-tiger';
 import { WidgetAlertUserNotification } from '@gooddata/api-client-tiger';
-import { WorkspacePermissionAssignment } from '@gooddata/sdk-backend-spi';
 
 export { AnonymousAuthProvider }
 
@@ -89,8 +84,6 @@ export type DeclarativeLogicalModel = DeclarativeModel;
 
 export { DeclarativeModel }
 
-export { DeclarativePdm }
-
 // @internal (undocumented)
 export type DependentEntitiesGraphRequest = DependentEntitiesRequest;
 
@@ -153,14 +146,6 @@ export interface ICustomApplicationSetting {
     id: string;
 }
 
-// @internal
-export interface IDataSource {
-    // (undocumented)
-    entity: JsonApiDataSourceInDocument;
-    // (undocumented)
-    pdm: DeclarativePdm;
-}
-
 // @internal (undocumented)
 export interface IDataSourceApiResult {
     // (undocumented)
@@ -334,52 +319,18 @@ export type OriginInfoWithId = JsonApiAnalyticalDashboardOutMetaOrigin & {
     id: string;
 };
 
-// @internal (undocumented)
-export type PhysicalDataModel = DeclarativePdm;
-
-// @internal (undocumented)
-export interface PublishPdmResult {
-    // (undocumented)
-    status: string;
-}
-
 // @internal (undocumented)
 export type PutWorkspaceLayoutRequest = LayoutApiPutWorkspaceLayoutRequest;
 
 // @public
 export function redirectToTigerAuthentication(context: IAuthenticationContext, error: NotAuthenticated): void;
 
-// @internal (undocumented)
-export interface ScanRequest {
-    // (undocumented)
-    scanTables: boolean;
-    // (undocumented)
-    scanViews: boolean;
-    // (undocumented)
-    schemata: string[];
-    // (undocumented)
-    separator: string;
-    // (undocumented)
-    tablePrefix: string;
-    // (undocumented)
-    viewPrefix: string;
-}
-
-// @internal (undocumented)
-export interface ScanResult {
-    // (undocumented)
-    pdm: DeclarativeTables;
-}
-
 // @internal (undocumented)
 export type ScanSqlResult = ScanSqlResponse;
 
 // @alpha
 export type SetJwtCallback = (jwt: string, secondsBeforeTokenExpirationToCallReminder?: number) => void;
 
-// @internal (undocumented)
-export type SetPdmLayoutRequest = LayoutApiSetPdmLayoutRequest;
-
 // @public
 export type TigerAfmType = "label" | "metric" | "dataset" | "fact" | "attribute" | "prompt";
 
@@ -437,11 +388,8 @@ export type TigerSpecificFunctions = {
     deleteApiToken?: (userId: string, tokenId: string) => Promise<void>;
     someDataSourcesExists?: (filter?: string) => Promise<boolean>;
     generateLogicalModel?: (dataSourceId: string, generateLogicalModelRequest: GenerateLogicalModelRequest) => Promise<DeclarativeLogicalModel>;
-    scanDataSource?: (dataSourceId: string, scanRequest: ScanRequest) => Promise<ScanResult>;
-    publishPdm?: (dataSourceId: string, declarativePdm: PhysicalDataModel) => Promise<PublishPdmResult>;
     createDemoWorkspace?: (sampleWorkspace: WorkspaceDefinition) => Promise<string>;
     createDemoDataSource?: (sampleDataSource: DataSourceDefinition) => Promise<string>;
-    setPdmLayout?: (requestParameters: SetPdmLayoutRequest) => Promise<void>;
     createWorkspace?: (id: string, name: string) => Promise<string>;
     updateWorkspaceTitle?: (id: string, name: string) => Promise<void>;
     deleteWorkspace?: (id: string) => Promise<void>;
@@ -460,7 +408,6 @@ export type TigerSpecificFunctions = {
     testDataSourceConnection?: (connectionData: IDataSourceTestConnectionRequest, id?: string) => Promise<IDataSourceTestConnectionResponse>;
     publishLogicalModel?: (workspaceId: string, declarativeModel: DeclarativeLogicalModel) => Promise<void>;
     getDataSourceSchemata?: (dataSourceId: string) => Promise<string[]>;
-    getPdm?: (dataSourceId: string) => Promise<PhysicalDataModel>;
     getDependentEntitiesGraph?: (workspaceId: string) => Promise<DependentEntitiesGraphResponse>;
     getDependentEntitiesGraphFromEntryPoints?: (workspaceId: string, dependentEntitiesGraphRequest: DependentEntitiesGraphRequest) => Promise<DependentEntitiesGraphResponse>;
     resolveAllEntitlements?: () => Promise<ApiEntitlement[]>;
@@ -513,15 +460,6 @@ export type TigerSpecificFunctions = {
         alert: IWidgetAlert;
         insight: IInsight;
     }[]>;
-    getUserById?: (userId: string) => Promise<IWorkspaceUser>;
-    getUsers?: () => Promise<ManageUsers>;
-    getUserGroups?: () => Promise<ManageUserGroups>;
-    getWorkspacePermissionsForUser?: (userId: string) => Promise<WorkspacePermissionAssignment[]>;
-    getWorkspacePermissionsForUserGroup?: (userGroupId: string) => Promise<WorkspacePermissionAssignment[]>;
-    manageWorkspacePermissionsForUser?: (userId: string, permissions: WorkspacePermissionAssignment[]) => Promise<void>;
-    manageWorkspacePermissionsForUserGroup?: (userGroupId: string, permissions: WorkspacePermissionAssignment[]) => Promise<void>;
-    updateUserDetails?: (user: IWorkspaceUser) => Promise<void>;
-    changeUserOrgAdminStatus?: (userId: string, isOrgAdmin: boolean) => Promise<void>;
 };
 
 // @public

libs/sdk-backend-tiger/src/backend/organization/fromBackend/userConvertor.ts

@@ -15,9 +15,6 @@ const constructFullName = (firstName?: string, lastName?: string) =>
         ? `${firstName || ""}${firstName && lastName ? " " : ""}${lastName || ""}`
         : undefined;
 
-const constructFullName = (firstName?: string, lastName?: string) =>
-    firstName && lastName ? `${firstName} ${lastName}` : undefined;
-
 export const convertUser = (user: JsonApiUserOutDocument): IUser => {
     const firstName = user.data.attributes?.firstname;
     const lastName = user.data.attributes?.lastname;

libs/sdk-backend-tiger/src/backend/tigerSpecificFunctions.ts

@@ -15,8 +15,6 @@ import {
     JsonApiOrganizationPatchTypeEnum,
     JsonApiApiTokenOutList,
     MetadataUtilities,
-    DeclarativePdm,
-    DeclarativeTables,
     DeclarativeWorkspaceDataFilters,
     DependentEntitiesRequest,
     DependentEntitiesResponse,
@@ -28,7 +26,6 @@ import {
     ITigerClient,
     JsonApiApiTokenInDocument,
     JsonApiApiTokenInTypeEnum,
-    JsonApiApiTokenOutList,
     JsonApiCspDirectiveInDocument,
     JsonApiCspDirectiveInTypeEnum,
     JsonApiCustomApplicationSettingOut,
@@ -37,22 +34,14 @@ import {
     JsonApiDataSourceIdentifierOutDocument,
     JsonApiDataSourceIdentifierOutWithLinks,
     JsonApiDataSourceInAttributesTypeEnum,
-    JsonApiDataSourceInDocument,
     JsonApiDataSourceInTypeEnum,
     JsonApiDataSourceOutDocument,
-    JsonApiDataSourceIdentifierOutDocument,
-    DeclarativeAnalytics,
     JsonApiFilterContextOutWithLinks,
-    jsonApiHeaders,
     JsonApiOrganizationOutMetaPermissionsEnum,
-    JsonApiOrganizationPatchTypeEnum,
     JsonApiVisualizationObjectOutWithLinks,
     JsonApiWorkspaceInDocument,
     JsonApiWorkspaceInTypeEnum,
     KeyDriversDimension,
-    LayoutApiPutWorkspaceLayoutRequest,
-    LayoutApiSetPdmLayoutRequest,
-    MetadataUtilities,
     OrganizationUtilities,
     PlatformUsage,
     RecentAnalyticalObject,
@@ -61,9 +50,6 @@ import {
     TestDefinitionRequestTypeEnum,
     VisualizationObjectModelV1,
     WidgetAlertUserNotification,
-    KeyDriversDimension,
-    AnomalyUserNotification,
-    KeyDriversDimension,
     JsonApiWorkspaceDataFilterInDocument,
     JsonApiWorkspaceDataFilterOutDocument,
     JsonApiWorkspaceDataFilterSettingOutDocument,

libs/sdk-backend-tiger/src/convertors/fromBackend/AccessControlConverter.ts

@@ -26,7 +26,7 @@ const getPermissionLevels = (permissions: GrantedPermission[] = [], source: "dir
 
 export const convertRulesPermission = (rule: RulePermission): IGranularRulesAccess => ({
     type: "allWorkspaceUsers",
-    permissions: (rule.permissions ?? []) as AccessGranularPermission[],
+    permissions: ((rule.permissions ?? []) as unknown) as AccessGranularPermission[],
     inheritedPermissions: [],
 });