Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
614317f5
Commit
614317f5
authored
May 26, 2021
by
Guillaume Heurtier
Browse files
FIX #17058 TIME 0:10 hide error message when loading action list in indexation
parent
9e9e3166
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/frontend/app/indexation/indexation.component.html
View file @
614317f5
...
...
@@ -12,7 +12,7 @@
</div>
<div
class=
"actions-indexing-form"
>
<ng-container
*ngIf=
"actionsList.length > 0 && indexingForm !== undefined && selectedAction !== undefined"
>
*ngIf=
"
actionsListLoaded &&
actionsList.length > 0 && indexingForm !== undefined && selectedAction !== undefined"
>
<button
mat-button
class=
"button-form-primary"
[disabled]=
"selectedAction.id === 0"
[matMenuTriggerFor]=
"menu"
style=
"width:350px;margin-right:20px;"
[title]=
"selectedAction.label"
>
...
...
@@ -52,7 +52,7 @@
<mat-icon
class=
"fa fa-check"
></mat-icon>
</button>
</ng-container>
<div
class=
"emptyAction"
*ngIf=
"actionsList.length === 0"
<div
class=
"emptyAction"
*ngIf=
"
actionsListLoaded &&
actionsList.length === 0"
[innerHTML]=
"'lang.noAvailableAction' | translate"
></div>
</div>
</ng-container>
...
...
@@ -95,4 +95,4 @@
autoFocus=
"false"
>
<app-indexation-attachments-list
#appIndexationAttachmentsList
></app-indexation-attachments-list>
</mat-sidenav>
</mat-sidenav-container>
\ No newline at end of file
</mat-sidenav-container>
src/frontend/app/indexation/indexation.component.ts
View file @
614317f5
...
...
@@ -13,9 +13,9 @@ import { AppService } from '@service/app.service';
import
{
IndexingFormComponent
}
from
'
./indexing-form/indexing-form.component
'
;
import
{
tap
,
finalize
,
catchError
,
map
,
filter
,
take
}
from
'
rxjs/operators
'
;
import
{
DocumentViewerComponent
}
from
'
../viewer/document-viewer.component
'
;
import
{
ConfirmComponent
}
from
'
../../
plugins/modal/confirm.component
'
;
import
{
ConfirmComponent
}
from
'
@
plugins/modal/confirm.component
'
;
import
{
ActionsService
}
from
'
../actions/actions.service
'
;
import
{
SortPipe
}
from
'
../../
plugins/sorting.pipe
'
;
import
{
SortPipe
}
from
'
@
plugins/sorting.pipe
'
;
import
{
FunctionsService
}
from
'
@service/functions.service
'
;
import
{
of
,
Subscription
}
from
'
rxjs
'
;
import
{
SelectIndexingModelComponent
}
from
'
./select-indexing-model/select-indexing-model.component
'
;
...
...
@@ -46,6 +46,7 @@ export class IndexationComponent implements OnInit, OnDestroy {
currentGroupId
:
number
;
actionsList
:
any
[]
=
[];
actionsListLoaded
:
boolean
=
false
;
selectedAction
:
any
=
{
id
:
0
,
label
:
''
,
...
...
@@ -136,6 +137,7 @@ export class IndexationComponent implements OnInit, OnDestroy {
tap
((
data
:
any
)
=>
{
this
.
selectedAction
=
data
.
actions
[
0
];
this
.
actionsList
=
data
.
actions
;
this
.
actionsListLoaded
=
true
;
}),
finalize
(()
=>
this
.
loading
=
false
),
catchError
((
err
:
any
)
=>
{
...
...
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