FIX: npm ci

FIX: send correct name and email from user payload

docsfera.json

@@ -4747,6 +4747,42 @@
           ]
         }
       },
+      "/platform/jobs/{jobId}/rename-tables": {
+        "post": {
+          "operationId": "PlatformApiController_renameJobTables",
+          "summary": "Rename job output tables and sync to catalog",
+          "parameters": [
+            {
+              "name": "jobId",
+              "required": true,
+              "in": "path",
+              "schema": {
+                "type": "string"
+              }
+            }
+          ],
+          "responses": {
+            "201": {
+              "description": "",
+              "content": {
+                "application/json": {
+                  "schema": {
+                    "type": "object"
+                  }
+                }
+              }
+            }
+          },
+          "tags": [
+            "Platform API"
+          ],
+          "security": [
+            {
+              "access-token": []
+            }
+          ]
+        }
+      },
       "/platform/jobs/jdbc/configs/allowed_datatypes": {
         "get": {
           "operationId": "PlatformApiController_getJdbcAllowedDatatypes",
@@ -10125,6 +10161,21 @@
             "entities"
           ]
         },
+        "Column": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "type": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "name",
+            "type"
+          ]
+        },
         "TableColumns": {
           "type": "object",
           "properties": {
@@ -10140,13 +10191,7 @@
             "references": {
               "type": "array",
               "items": {
-                "type": "string"
-              }
-            },
-            "identifier_columns": {
-              "type": "array",
-              "items": {
-                "type": "string"
+                "$ref": "#/components/schemas/Column"
               }
             },
             "destination": {
@@ -10154,13 +10199,20 @@
             },
             "type": {
               "type": "string"
+            },
+            "identifier_columns": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "reference_column": {
+              "$ref": "#/components/schemas/Column"
             }
           },
           "required": [
             "name",
             "columns",
-            "references",
-            "identifier_columns",
             "destination",
             "type"
           ]
@@ -10466,7 +10518,7 @@
             "enabled"
           ]
         },
-        "CustomerLink": {
+        "CustomerLinkItem": {
           "type": "object",
           "properties": {
             "href": {
@@ -10488,28 +10540,61 @@
             "description"
           ]
         },
-        "CustomerLinksResponse": {
+        "CustomerSidebarSection": {
           "type": "object",
           "properties": {
-            "links": {
+            "title": {
+              "type": "object"
+            },
+            "items": {
               "type": "array",
               "items": {
-                "$ref": "#/components/schemas/CustomerLink"
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/CustomerSidebarMenuItem"
+                  },
+                  {
+                    "$ref": "#/components/schemas/CustomerSidebarLinkItem"
+                  }
+                ]
               }
             }
           },
           "required": [
-            "links"
+            "title",
+            "items"
           ]
         },
+        "CustomerLinksConfig": {
+          "type": "object",
+          "properties": {
+            "home": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/CustomerLinkItem"
+              }
+            },
+            "sidebar": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/CustomerSidebarSection"
+              }
+            }
+          }
+        },
+        "CustomerLinksResponse": {
+          "type": "object",
+          "properties": {
+            "links": {
+              "$ref": "#/components/schemas/CustomerLinksConfig"
+            }
+          }
+        },
         "CustomerLinkRequest": {
           "type": "object",
           "properties": {
             "links": {
-              "type": "array",
-              "items": {
-                "$ref": "#/components/schemas/CustomerLink"
-              }
+              "$ref": "#/components/schemas/CustomerLinksConfig"
             }
           },
           "required": [

package-lock.json

@@ -17,7 +17,7 @@
         "@aws-sdk/signature-v4": "^3.370.0",
         "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
         "@dadosfera/protospack": "2.5.3",
-        "@dadosfera/protospack-v2": "3.38.0-beta.28",
+        "@dadosfera/protospack-v2": "^3.38.0-beta.30",
         "@grpc/grpc-js": "^1.9.3",
         "@grpc/proto-loader": "^0.7.9",
         "@nestjs/cli": "^9.5.0",
@@ -1744,10 +1744,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.38.0-beta.28",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.38.0-beta.28.tgz",
-      "integrity": "sha512-w3Au0qschqZJ6OSHVDKaR2KeeCF2ncuJ4k7iZQceOLo1zxUU3TpDyLYyp/rp1DoSG763uIgqm3kJUXv7RlmfNw==",
-      "license": "ISC",
+      "version": "3.38.0-beta.30",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.38.0-beta.30.tgz",
+      "integrity": "sha512-EePtEV4Bjr47BCtQgeZP8WzappDv1mRWMro15ms+Vdev/FIVBydMew/BtK3spzI7KHWJniB0Ctsvpcdj2GiTDA==",
       "dependencies": {
         "@grpc/grpc-js": "^1.9.3",
         "rxjs": "^7.5.5"

package.json

@@ -35,7 +35,7 @@
     "@aws-sdk/signature-v4": "^3.370.0",
     "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
     "@dadosfera/protospack": "2.5.3",
-    "@dadosfera/protospack-v2": "3.38.0-beta.28",
+    "@dadosfera/protospack-v2": "^3.38.0-beta.30",
     "@grpc/grpc-js": "^1.9.3",
     "@grpc/proto-loader": "^0.7.9",
     "@nestjs/cli": "^9.5.0",

src/modules/auth/auth.controller.ts

@@ -489,6 +489,7 @@ export class AuthController {
       const userDto = {
         id: api_key.user_id,
         name: api_key.username,
+        email: api_key.username,
         customer: {
           id: api_key.customer_id,
           name: api_key.customer_name,

src/modules/auth/auth.service.ts

@@ -437,7 +437,8 @@ export class AuthClientService implements OnModuleInit {
 
     const userDto: UserDTO = {
       id: user.id,
-      name: user.username,
+      name: user.name,
+      email: user.email,
       jobTitle: user?.jobTitle || null,
       department: user?.department || null,
       hierarchy: user?.hierarchy || null,

src/modules/auth/dtos/login.ts

@@ -144,6 +144,7 @@ export interface BulkEditResponse {
 export type UserDTO = {
   id: string,
   name: string,
+  email: string,
   jobTitle?: string,
   department?: string,
   hierarchy?: string,

src/modules/customers/customers.service.ts

@@ -9,12 +9,12 @@ import {
 } from '@nestjs/common';
 
 import { firstValueFrom, lastValueFrom } from 'rxjs';
-import { Link } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities';
 import { DucClient } from '../duc/client.config';
 import { ClientGrpc } from '@nestjs/microservices';
 import { ProtoServices } from '@dadosfera/protospack-v2/dist/lib/Duc';
-import { CustomerUpdateRequest } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
+import { CustomerSetLinksRequest } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 import { CustomersProtoService } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/write-service';
+import { CustomerLinksConfig } from './dtos/customers';
 import ErrorCodes from 'src/utils/errorCodes';
 import jwt from 'jsonwebtoken';
 import {
@@ -67,12 +67,12 @@ export class CustomersService implements OnModuleInit {
     )
   }
 
-  async getLinks(customerId: string) {
+  async getLinks(customerId: string): Promise<CustomerLinksConfig | null> {
     try {
       const result = await lastValueFrom(
-        this.customerService.CustomerFindOneById({ id: customerId }),
+        this.customerService.CustomerGetLinks({ customerId }),
       );
-      return result.customer?.links || [];
+      return (result.links as CustomerLinksConfig) || null;
     } catch (err) {
       if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
         throw new HttpException(err.details, HttpStatus.NOT_FOUND);
@@ -80,17 +80,17 @@ export class CustomersService implements OnModuleInit {
     }
   }
 
-  async setLinks(customerId: string, links: Link[]) {
+  async setLinks(customerId: string, links: CustomerLinksConfig) {
     if (!customerId || !links) {
       throw new HttpException(null, HttpStatus.BAD_REQUEST);
     }
 
     try {
       return await firstValueFrom(
-        this.customerService.CustomerUpdate({
-          id: customerId,
-          links,
-        } as CustomerUpdateRequest),
+        this.customerService.CustomerSetLinks({
+          customerId,
+          links: links as CustomerSetLinksRequest['links'],
+        }),
       );
     } catch (err) {
       if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)

src/modules/customers/dtos/customers.ts

@@ -1,7 +1,6 @@
-import { Link } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/entities';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 
-export class CustomerLink implements Link {
+export class CustomerLinkItem {
   @ApiProperty()
   href: string;
   @ApiProperty()
@@ -9,15 +8,59 @@ export class CustomerLink implements Link {
   @ApiProperty()
   description: string;
   @ApiPropertyOptional()
-  iconSrc: string;
+  iconSrc?: string;
 }
+
+export class CustomerSidebarLinkItem {
+  @ApiProperty()
+  type: 'link';
+  @ApiProperty({ type: Object })
+  title: Record<string, string>;
+  @ApiProperty()
+  link: string;
+  @ApiPropertyOptional()
+  icon?: string;
+}
+
+export class CustomerSidebarMenuItem {
+  @ApiProperty()
+  type: 'menu';
+  @ApiProperty({ type: Object })
+  title: Record<string, string>;
+  @ApiPropertyOptional()
+  icon?: string;
+  @ApiProperty({ type: [CustomerSidebarLinkItem] })
+  items: CustomerSidebarLinkItem[];
+}
+
+export class CustomerSidebarSection {
+  @ApiProperty({ type: Object })
+  title: Record<string, string>;
+  @ApiProperty({
+    type: 'array',
+    items: {
+      oneOf: [
+        { $ref: '#/components/schemas/CustomerSidebarMenuItem' },
+        { $ref: '#/components/schemas/CustomerSidebarLinkItem' },
+      ],
+    },
+  })
+  items: (CustomerSidebarMenuItem | CustomerSidebarLinkItem)[];
+}
+
+export class CustomerLinksConfig {
+  @ApiPropertyOptional({ type: [CustomerLinkItem] })
+  home?: CustomerLinkItem[];
+  @ApiPropertyOptional({ type: [CustomerSidebarSection] })
+  sidebar?: CustomerSidebarSection[];
+}
+
 export class CustomerLinkRequest {
-  @ApiProperty({ type: [CustomerLink] })
-  links: CustomerLink[];
+  @ApiProperty({ type: CustomerLinksConfig })
+  links: CustomerLinksConfig;
 }
 
 export class CustomerLinksResponse {
-  @ApiProperty({ type: [CustomerLink] })
-  links: CustomerLink[];
-}
-
+  @ApiPropertyOptional({ type: CustomerLinksConfig })
+  links?: CustomerLinksConfig;
+}

src/modules/inputs/dtos/input.model.ts

@@ -11,17 +11,19 @@ export class TableColumns {
   name: string;
   @ApiProperty()
   columns: string[];
-  @ApiProperty()
+  @ApiPropertyOptional({ type: [Column] })
   references: Column[];
   @ApiProperty()
-  identifier_columns: string[];
-  @ApiProperty()
   destination: Record<'raw' | 'qualify', {
     table_name: string;
     table_schema: string;
   }> | null;
   @ApiProperty()
   type: string;
+  @ApiPropertyOptional({ type: [String] })
+  identifier_columns?: string[];
+  @ApiPropertyOptional({ type: Column })
+  reference_column?: Column;
 }
 export class AvailableEntity {
   @ApiProperty()

src/modules/inputs/inputs.service.ts

@@ -164,6 +164,11 @@ export class InputsService {
     const inputCreateGenericRequest: InputCreateGenericRequest = {
       input: {
         ...body,
+        tables: (body.tables || []).map((table) => ({
+          ...table,
+          identifier_columns: table.identifier_columns || [],
+          reference_column: table.reference_column || table.references?.[0],
+        })),
       },
       info,
     };