Merge pull request #156 from dadosfera/fix/pipeline-properties

Fix/pipeline properties

src/modules/catalog/catalog.service.ts

@@ -407,7 +407,7 @@ class CatalogService implements OnModuleInit {
   }
 
   async createDataDescription(body, metadata) {
-    const response = await lastValueFrom(
+    await lastValueFrom(
       this.catalogWriteService.UpdateDataAsset(
         {
           id: `dataset-${body.table_id}`,

src/modules/connector/client.service.ts

@@ -263,13 +263,13 @@ export class ConnectorClientService implements OnModuleInit {
     });
   }
 
-  async getConnectorDetails(plugin: string, language: string) {
+  async getConnectorDetails(connectorId: string, language: string) {
     const meta = new Metadata();
     meta.add('Language', language);
     return lastValueFrom(
       this.connectorServiceRead.GetConnectorDetails(
         {
-          plugin,
+          plugin: connectorId,
         },
         meta,
       ),

src/modules/oauth/oauth.controller.ts

@@ -5,7 +5,6 @@ import { ConnectionClientService } from '../connection/client.service';
 import jwt from 'jsonwebtoken';
 import DadosferaLogger from '@dadosfera/dadosfera-logs/dist';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
-import { Authenticated } from 'src/authentication/authentication.decorator';
 @ApiTags('oauth')
 @Controller('oauth')
 export class OauthController {

src/modules/pipelinesV2/pipelines.controller.ts

@@ -61,7 +61,7 @@ export class PipelinesController {
     @User() user: RequestUser,
     @Body() createPipelineDto: ICreatePipelineV2Req,
   ) {
-    this.logger.info(process.env.DEV_URL + `/pipelines ON CREATE ROUTE`);
+    this.logger.info('PipelinesController - create', { user });
     if (!language) language = 'en-us';
     const { customer_id, customer_name, username, user_id } = user;
     const metadata = PackTheMetadata({
@@ -86,10 +86,7 @@ export class PipelinesController {
     @Headers('Dadosfera-Lang') language,
     @Query() data,
   ) {
-    this.logger.info(process.env.DEV_URL + `/pipeline ON Find All ROUTE`, {
-      user: user.user_id,
-      customer: user.customer_name,
-    });
+    this.logger.info('PipelinesController - findAll', { user });
 
     if (!language) language = 'en-us';
 
@@ -109,13 +106,28 @@ export class PipelinesController {
     };
   }
 
+  @Get(':id/config')
+  async getPipelineproperties(
+    @Headers('Dadosfera-Lang') language,
+    @User() user: RequestUser,
+    @Param('id') id,
+  ) {
+    this.logger.info('PipelinesController - getPipelineproperties', { user });
+    const metadata = PackTheMetadata({
+      ...user,
+      language: language || 'pt-br',
+    });
+    return this.pipelinesClientService.findOneProperties(id, metadata);
+  }
+
   @Get('/:id')
   async findOne(
     @Headers('Dadosfera-Lang') language,
     @User() user: RequestUser,
     @Param('id') id,
   ): Promise<Messages.PipelineV2FindOneResponse> {
-    this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON Find One ROUTE`);
+    this.logger.info('PipelinesController - findOne', { user });
+
     if (!language) language = 'en-us';
 
     const { customer_id, customer_name, user_id, username } = user;
@@ -147,14 +159,16 @@ export class PipelinesController {
       });
     return result;
   }
-
   @Put('/:id')
-  async update(@Body() updatePipelineDto, @Param('id') id) {
+  async update(
+    @Body() updatePipelineDto,
+    @Param('id') id,
+    @User() user: RequestUser,
+  ) {
+    this.logger.info('PipelinesController - findOne', { user });
     const { info } = updatePipelineDto;
     delete updatePipelineDto.info;
 
-    this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON UPDATE ROUTE`);
-
     const response = await this.pipelinesClientService.update({
       ...updatePipelineDto,
       info,
@@ -165,9 +179,9 @@ export class PipelinesController {
   }
 
   @Delete(':id')
-  async delete(@Body() data, @Param() params) {
+  async delete(@Body() data, @Param() params, @User() user: RequestUser) {
     const { id } = params;
-    this.logger.info(process.env.DEV_URL + `/pipeline/${id} ON DELETE ROUTE`);
+    this.logger.info('PipelinesController - findOne', { user });
 
     const response = await this.pipelinesClientService.remove({ id, ...data });
 

src/modules/pipelinesV2/pipelines.module.ts

@@ -8,6 +8,7 @@ import { PipelinesService } from './pipelines.service';
 import { PipelinesClientConfiguration } from './pipelines-client';
 
 import { PipelinesModule as OldPipelineModule } from 'src/modules/pipelines/pipelines.module';
+import { ConnectorModule } from '../connector/connector.module';
 
 const client = new PipelinesClientConfiguration();
 
@@ -15,6 +16,7 @@ const client = new PipelinesClientConfiguration();
   imports: [
     ClientsModule.register([client.providerOptions]),
     OldPipelineModule,
+    ConnectorModule,
   ],
   controllers: [PipelinesController],
   providers: [PipelinesService, DadosferaLogger],

src/modules/pipelinesV2/pipelines.service.ts

@@ -17,6 +17,8 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { PipelinesClientConfiguration } from './pipelines-client';
 import { ICreatePipelineV2Req } from './interfaces';
 import { PipelineV2CreateRequest } from '@dadosfera/protospack-v2/dist/lib/PipelineV2/interfaces/messages';
+import { Metadata } from '@grpc/grpc-js';
+import { ConnectorClientService } from '../connector/client.service';
 
 export class PipelinesService implements OnModuleInit {
   logger: DadosferaLogger;
@@ -27,6 +29,7 @@ export class PipelinesService implements OnModuleInit {
     dadosferaLogger: DadosferaLogger,
     @Inject(PipelinesClientConfiguration.name)
     private readonly grpcClient: ClientGrpc,
+    private readonly connectorService: ConnectorClientService,
   ) {
     this.logger = dadosferaLogger.logger;
   }
@@ -169,4 +172,40 @@ export class PipelinesService implements OnModuleInit {
 
     return removePipelineResponse;
   }
+
+  async findOneProperties(id: string, metadata: Metadata) {
+    this.logger.info('PipelinesClientService - findOneProperties');
+    const { pipeline } = await this.findOne({ id }, metadata);
+
+    const pipelineProperties = JSON.parse(pipeline.properties);
+
+    const connectorId = `${pipeline.connector_plugin}-${pipeline.connector_version}`;
+
+    const res = await this.connectorService.getConnectorDetails(
+      connectorId,
+      metadata.get('language')[0].toString(),
+    );
+    const connector = JSON.parse(res.connector);
+    const config_controls = connector.config_controls || [];
+
+    for (const key in pipelineProperties) {
+      const i = config_controls
+        .map((cc) => cc.name)
+        .indexOf(`properties.${key}`);
+      if (i > -1) {
+        config_controls[i] = {
+          ...config_controls[i],
+          default_value: pipelineProperties[key],
+        };
+      }
+    }
+
+    return {
+      pipeline: {
+        ...pipeline,
+        config_controls,
+        properties: pipelineProperties,
+      },
+    };
+  }
 }

src/modules/users/dtos/entities.ts

@@ -55,7 +55,10 @@ export class UserNoRoles extends OmitType(User, ['roles']) {}
 export class UserNoRolesAndCustomer extends OmitType(UserNoRoles, [
   'customer',
 ]) {}
-export class UserByCustomer extends OmitType(User, ['customer']) {}
+export class IUserByCustomer extends OmitType(User, ['customer']) {
+  @ApiPropertyOptional()
+  permissions?: string[];
+}
 
 export class CreateUserReq {
   @ApiPropertyOptional()
@@ -111,11 +114,11 @@ export class UpdateUserReq {
 
 export class UpdateUserRes {
   @ApiProperty()
-  user: UserByCustomer;
+  user: IUserByCustomer;
 }
 export class GetAllUsersByCustomerIdRes {
-  @ApiProperty({ type: [UserByCustomer] })
-  users: UserByCustomer[];
+  @ApiProperty({ type: [IUserByCustomer] })
+  users: IUserByCustomer[];
   @ApiProperty()
   departments: string[];
   @ApiProperty()
@@ -153,7 +156,7 @@ export class SetUserRolesReq {
 
 export class SetUserRolesRes {
   @ApiProperty()
-  user: UserByCustomer;
+  user: IUserByCustomer;
 }
 
 export class SearchUserRes extends GetAllUsersByCustomerIdRes {}

src/modules/users/users.controller.ts

@@ -45,7 +45,7 @@ import {
   UnassignRoleToUserReq,
   UpdateUserReq,
   UpdateUserRes,
-  UserByCustomer,
+  IUserByCustomer,
 } from './dtos/entities';
 import { UsersService } from './users.service';
 import { Metadata } from '@grpc/grpc-js';
@@ -126,7 +126,7 @@ export class UsersController {
 
   @Get(':id')
   @ApiOkResponse({
-    type: UserByCustomer,
+    type: IUserByCustomer,
   })
   async findOneById(
     @User() user: RequestUser,

src/modules/users/users.service.ts

@@ -18,6 +18,7 @@ import {
   BatchCreateUserReq,
   CreateUserReq,
   Hierarchy,
+  IUserByCustomer,
   SetUserRolesReq,
   UpdateUserReq,
 } from './dtos/entities';
@@ -77,11 +78,21 @@ export class UsersService implements OnModuleInit {
     };
   }
 
-  async findOneById(id: string) {
+  async findOneById(id: string): Promise<{ user: IUserByCustomer }> {
     const { user } = await lastValueFrom(
       this.usersClientService.UserFindOneById({ id }),
     );
-    return { user: this.adjustUsersPayload([user])[0] };
+    const res: { user: IUserByCustomer } = {
+      user: this.adjustUsersPayload([user])[0],
+    };
+    if (res.user.roles?.length) {
+      const allPermissions = res.user.roles.flatMap((r) => r.permissions);
+      const distinctPermissions = Array.from(
+        new Set(allPermissions.map((p) => p.claim)),
+      );
+      res.user.permissions = distinctPermissions;
+    }
+    return res;
   }
 
   async createUser(req: CreateUserReq, meta?: Metadata) {