Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aeropuertov2-front-framework
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Charles Torres
aeropuertov2-front-framework
Commits
8f00e57d
Commit
8f00e57d
authored
Sep 15, 2020
by
Sebastian Chicoma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correcciones y cambios:
se agergó al usuario en la sincronización
parent
64eb3b1f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
7 deletions
+36
-7
agent-status.pipe.ts
...ebot-html/src/app/modules/agent/pipe/agent-status.pipe.ts
+2
-0
agent.service.ts
...tebot-html/src/app/modules/agent/service/agent.service.ts
+6
-2
agent-list.component.ts
...app/modules/agent/view/agent-list/agent-list.component.ts
+5
-2
ca-file-upload-modal.component.html
.../ca-file-upload-modal/ca-file-upload-modal.component.html
+1
-1
en.json
projects/bytebot-html/src/assets/i18n/en.json
+11
-1
es.json
projects/bytebot-html/src/assets/i18n/es.json
+11
-1
No files found.
projects/bytebot-html/src/app/modules/agent/pipe/agent-status.pipe.ts
View file @
8f00e57d
...
...
@@ -12,6 +12,8 @@ export class AgentStatusPipe implements PipeTransform {
return
'label.created'
;
case
'DP'
:
return
'label.deployed'
;
case
'PS'
:
return
'label.sync-pending'
;
}
}
...
...
projects/bytebot-html/src/app/modules/agent/service/agent.service.ts
View file @
8f00e57d
...
...
@@ -40,8 +40,12 @@ export class AgentService extends DynaDataService {
return
this
.
httpClient
.
get
(
this
.
serviceURL
+
'/channels'
);
}
synchronize
(
id
:
number
)
{
return
this
.
httpClient
.
get
(
this
.
serviceURL
+
'/synchronize/'
+
id
);
synchronize
(
id
:
number
,
user
:
string
)
{
return
this
.
httpClient
.
get
(
this
.
serviceURL
+
'/synchronize/'
+
id
,
{
params
:
{
user
}
});
}
}
projects/bytebot-html/src/app/modules/agent/view/agent-list/agent-list.component.ts
View file @
8f00e57d
import
{
Component
,
OnInit
,
ViewChild
,
ViewContainerRef
,
Input
}
from
'@angular/core'
;
import
{
MatPaginator
,
MatSort
}
from
'@angular/material'
;
import
{
ColumnTemplate
,
DynaDataSource
,
ConfirmationDialogService
,
extractRSQL
,
FieldFilter
}
from
'@xdf/gallery'
;
import
{
Pagination
,
SortField
,
NotificationType
,
NotificationService
}
from
'@xdf/commons'
;
import
{
Pagination
,
SortField
,
NotificationType
,
NotificationService
,
AuthenticationService
}
from
'@xdf/commons'
;
import
{
Router
,
ActivatedRoute
}
from
'@angular/router'
;
import
{
first
,
tap
}
from
'rxjs/operators'
;
import
{
TagFilter
}
from
'@xdf/gallery/lib/views/gallery/ngx-tags-input/model/tag-filter'
;
...
...
@@ -169,6 +169,7 @@ export class AgentListComponent implements OnInit {
private
notificationService
:
NotificationService
,
private
translateService
:
TranslateService
,
protected
confirmationDialogService
:
ConfirmationDialogService
,
private
authenticationService
:
AuthenticationService
,
protected
vcRef
:
ViewContainerRef
)
{
}
...
...
@@ -307,7 +308,9 @@ export class AgentListComponent implements OnInit {
}
synchronize
(
item
)
{
this
.
agentService
.
synchronize
(
item
.
id
).
pipe
(
first
()).
subscribe
(()
=>
{
let
user
=
(
this
.
authenticationService
.
currentUserValue
?
this
.
authenticationService
.
currentUserValue
.
username
:
'admin'
);
this
.
agentService
.
synchronize
(
item
.
id
,
user
).
pipe
(
first
()).
subscribe
(()
=>
{
this
.
notificationService
.
showMessage
(
this
.
translateService
.
instant
(
"agent.synchronize.success"
),
undefined
,
NotificationType
.
success
);
this
.
onRefresh
();
});
...
...
projects/bytebot-html/src/app/modules/agent/view/components/ca-file-upload-modal/ca-file-upload-modal.component.html
View file @
8f00e57d
...
...
@@ -46,7 +46,7 @@
<!-- Position Column -->
<ng-container
[
matColumnDef
]="
column
"
*
ngFor=
"let column of displayedColumns"
>
<th
mat-header-cell
*
matHeaderCellDef
>
{{ 'header.' + column | translate}}
</th>
<td
mat-cell
*
matCellDef=
"let element"
>
{{element[column] | translate
</td>
<td
mat-cell
*
matCellDef=
"let element"
>
{{element[column] | translate
}}
</td>
</ng-container>
<tr
mat-header-row
*
matHeaderRowDef=
"displayedColumns; sticky: true"
></tr>
...
...
projects/bytebot-html/src/assets/i18n/en.json
View file @
8f00e57d
...
...
@@ -27,6 +27,7 @@
"label.status.off"
:
"Disabled"
,
"label.created"
:
"Created"
,
"label.deployed"
:
"Deployed"
,
"label.sync-pending"
:
"Sync pending"
,
"breadcrumb.agent"
:
"Agents"
,
"label.general-information.title"
:
"General information"
,
"label.general-information.description"
:
"Register the basic information for the agent"
,
...
...
@@ -54,6 +55,15 @@
"label.delete-channel"
:
"Delete channel"
,
"agent.edit.success"
:
"The agent was successfully edited"
,
"agent.create.success"
:
"The agent was created successfully"
,
"agent.synchronize.success"
:
"Synchronization was successful"
,
"error.message.complete-form"
:
"Complete the form correctly"
,
"label.file.tooltip"
:
"For security reasones, you cannot edit uploaded files. Please delete and upload a new file"
"label.file.tooltip"
:
"For security reasons, you cannot edit uploaded files. Please delete and upload a new file"
,
"EMPTY.VALUE"
:
"Empty value"
,
"NOT.FOUND.VALUE"
:
"Value not found"
,
"header.type"
:
"Column"
,
"header.header"
:
"Column"
,
"header.line"
:
"Line"
,
"header.value"
:
"Value"
,
"HEADER.REPETEAD"
:
"Repeated column"
,
"HEADER.NOT.FOUND"
:
"Column not found"
}
\ No newline at end of file
projects/bytebot-html/src/assets/i18n/es.json
View file @
8f00e57d
...
...
@@ -27,6 +27,7 @@
"label.status.off"
:
"En Baja"
,
"label.created"
:
"Creado"
,
"label.deployed"
:
"Desplegado"
,
"label.sync-pending"
:
"Pendiente de sincronización"
,
"breadcrumb.agent"
:
"Agentes"
,
"label.general-information.title"
:
"Información general"
,
"label.general-information.description"
:
"Registre la información correspondiente al agente"
,
...
...
@@ -54,6 +55,15 @@
"label.delete-channel"
:
"Borrar canal"
,
"agent.edit.success"
:
"El agente fue editado correctamente"
,
"agent.create.success"
:
"El agente fue creado correctamente"
,
"agent.synchronize.success"
:
"La sincronización se realizó correctamente"
,
"error.message.complete-form"
:
"Complete correctamente el formulario"
,
"label.file.tooltip"
:
"Por seguridad, no se pueden editar los archivos validados"
"label.file.tooltip"
:
"Por seguridad, no se pueden editar los archivos validados"
,
"EMPTY.VALUE"
:
"Celda vacía"
,
"NOT.FOUND.VALUE"
:
"Valor no encontrado"
,
"header.type"
:
"Columna"
,
"header.header"
:
"Columna"
,
"header.line"
:
"Línea"
,
"header.value"
:
"Valor"
,
"HEADER.REPETEAD"
:
"Columna repetida"
,
"HEADER.NOT.FOUND"
:
"Columna no encontrado"
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment