From 77a1606908ee7113a5d23a1f1c0e89211904f6a9 Mon Sep 17 00:00:00 2001 From: Guiheux Steven Date: Fri, 30 Sep 2022 17:55:09 +0200 Subject: [PATCH] refactor(ui): remove semantic from workflow/env/admin/favorite (#6311) --- .../project-breadcrumb.scss | 4 + ui/src/app/shared/shared.module.ts | 4 +- .../admin/hook-task/show/hook-task.show.html | 99 ++++++++-------- .../admin/service/list/service.list.html | 81 ++++++------- .../admin/service/list/service.list.scss | 41 +++++++ .../admin/service/show/service.show.html | 25 ++--- .../admin/service/show/service.show.scss | 8 ++ .../list/worker-model-pattern.list.html | 7 +- .../list/worker-model-pattern.list.scss | 5 + .../environment/add/environment.add.html | 59 +++++----- .../environment/add/environment.add.scss | 4 + .../environment/show/environment.show.html | 11 +- .../environment/show/environment.show.scss | 4 + .../views/favorite/favorite.component.html | 24 ++-- .../views/favorite/favorite.component.scss | 1 + .../project/show/permission/permission.html | 9 +- ui/src/app/views/project/show/project.html | 9 +- ui/src/app/views/project/show/project.scss | 4 + .../consumer-details-modal.component.ts | 2 +- ui/src/app/views/workflow/run/node/node.html | 2 +- ui/src/app/views/workflow/run/node/node.scss | 4 + .../workflow/run/node/pipeline/pipeline.html | 106 +++++++++--------- .../workflow/run/node/pipeline/pipeline.scss | 19 ++-- .../workflow-run-job/workflow-run-job.html | 2 +- .../run/node/summary/run.summary.html | 67 +++++------ .../run/node/summary/run.summary.scss | 13 ++- .../run/node/test/table/test.table.html | 79 ++++++------- .../run/node/test/table/test.table.scss | 6 +- ui/src/app/views/workflow/show/workflow.html | 10 +- ui/src/app/views/workflow/show/workflow.scss | 8 ++ .../workflow/sidebar/code/sidebar.code.html | 46 ++++---- .../workflow/sidebar/code/sidebar.code.scss | 16 ++- ui/src/assets/i18n/en.json | 10 -- 33 files changed, 434 insertions(+), 355 deletions(-) diff --git a/ui/src/app/shared/project-breadcrumb/project-breadcrumb.scss b/ui/src/app/shared/project-breadcrumb/project-breadcrumb.scss index 8f8a81edd0..64b0d71158 100644 --- a/ui/src/app/shared/project-breadcrumb/project-breadcrumb.scss +++ b/ui/src/app/shared/project-breadcrumb/project-breadcrumb.scss @@ -17,3 +17,7 @@ border-right: none; } } + +nz-breadcrumb { + display: inline; +} diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts index c4cfbf9644..bdfe888f48 100644 --- a/ui/src/app/shared/shared.module.ts +++ b/ui/src/app/shared/shared.module.ts @@ -114,7 +114,7 @@ import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; import { en_US, NZ_I18N } from 'ng-zorro-antd/i18n'; import { NzIconModule } from 'ng-zorro-antd/icon'; import { IconDefinition } from '@ant-design/icons-angular'; -import { AimOutline, ArrowDownOutline, ArrowRightOutline, AudioOutline, AudioMutedOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, CrownOutline, DeleteOutline, DragOutline, EyeInvisibleOutline, EyeOutline, FieldTimeOutline, FileTextOutline, KeyOutline, +import { AimOutline, ArrowDownOutline, ArrowRightOutline, AudioOutline, AudioMutedOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, CrownOutline, DeleteOutline, DragOutline, EyeInvisibleOutline, EyeOutline, FieldTimeOutline, FileTextOutline, FilterOutline, KeyOutline, HighlightFill, HistoryOutline, InfoCircleOutline, LockOutline, PhoneFill, PlayCircleOutline, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, RestOutline, SafetyCertificateOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, StopOutline, SyncOutline, TableOutline, TagsOutline, ToolFill, UndoOutline, UnlockFill, UnorderedListOutline, UploadOutline, UserOutline, WarningOutline, WarningFill } from '@ant-design/icons-angular/icons' import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; @@ -148,7 +148,7 @@ const ngZorroConfig: NzConfig = { }; const icons: IconDefinition[] = [ AimOutline, ArrowDownOutline, ArrowRightOutline, AudioOutline, AudioMutedOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, CrownOutline, DeleteOutline, DragOutline, - EyeInvisibleOutline, EyeOutline, FileTextOutline, FieldTimeOutline, KeyOutline, HighlightFill, HistoryOutline, InfoCircleOutline, LockOutline, PhoneFill, PlayCircleOutline, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, + EyeInvisibleOutline, EyeOutline, FileTextOutline, FieldTimeOutline, FilterOutline, KeyOutline, HighlightFill, HistoryOutline, InfoCircleOutline, LockOutline, PhoneFill, PlayCircleOutline, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, RestOutline, SafetyCertificateOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, StopOutline, SyncOutline, TableOutline, TagsOutline, ToolFill, UndoOutline, UnlockFill, UnorderedListOutline, UploadOutline, UserOutline, WarningOutline, WarningFill ]; @NgModule({ diff --git a/ui/src/app/views/admin/hook-task/show/hook-task.show.html b/ui/src/app/views/admin/hook-task/show/hook-task.show.html index 512d107512..8be2165db6 100644 --- a/ui/src/app/views/admin/hook-task/show/hook-task.show.html +++ b/ui/src/app/views/admin/hook-task/show/hook-task.show.html @@ -1,53 +1,60 @@
-
-
-
-
-

{{ 'workflow_node_hook_form_config' | translate }}

-
+
+ + + +

Hook configuration

-
-
- - - - - -
+ + {{k}} + + + + + + + + -
-
-
-
-

{{ 'hook_task_execs' | translate }}

+ + + + +

Executions

-
-
-

{{'workflow_hook_log_title' | translate}}

-
-
-
- -
-
-
- -
-
-
- -
-
-
- - -
-
-
-
-
+ + +

{{'workflow_hook_log_title' | translate}}

+ + {{'workflow_hook_log_workflow_run' | translate}} + + + + + + Status + + + + + + {{'common_error' | translate}} + + + + + + Body + + + + + + + + -
\ No newline at end of file + diff --git a/ui/src/app/views/admin/service/list/service.list.html b/ui/src/app/views/admin/service/list/service.list.html index 4a5d6ed6ed..1ad2894158 100644 --- a/ui/src/app/views/admin/service/list/service.list.html +++ b/ui/src/app/views/admin/service/list/service.list.html @@ -5,61 +5,54 @@
-
-
+ +

- {{'services_list' | translate}} -
-
+ CDS Services +
+ {{globalStatus.name}} {{globalStatus.status}} - {{globalStatus.value}} -
- -
+ + {{globalVersion.name}} {{globalVersion.status}} - {{globalVersion.value}} -
+

-
-
- -
-
-
-
- {{g.status}} + + + + +
+
+ + {{g.status}} + + {{ g.name }}
-
-
-
-
- n/a -
-
-
-
- -
-
- +
+
+ n/a +
+
-
+ +
-
-
- + + @@ -84,7 +77,7 @@

API Debug

-
{{ 'common_loading' | translate }}
+
diff --git a/ui/src/app/views/admin/service/list/service.list.scss b/ui/src/app/views/admin/service/list/service.list.scss index d55bdfa065..c307383eae 100644 --- a/ui/src/app/views/admin/service/list/service.list.scss +++ b/ui/src/app/views/admin/service/list/service.list.scss @@ -8,3 +8,44 @@ margin-bottom: 50px; } } + +.floatRight { + float: right; +} + +.pointer { + cursor: pointer; +} + +.red { + color: $cds_color_red; +} +.green { + color: $cds_color_green; +} +.orange { + color: $cds_color_orange; +} + +.title { + word-wrap: break-word; + font-weight: 700; + font-size: 1.2em; + line-height: 1.2em; + margin-bottom: 20px; +} + +nz-col { + margin-bottom: 30px; +} + +ul { + padding-left: 10px; + li { + list-style: none; + } +} + +nz-spin { + margin-top: 30px; +} diff --git a/ui/src/app/views/admin/service/show/service.show.html b/ui/src/app/views/admin/service/show/service.show.html index 9de12c0957..eaa368b50b 100644 --- a/ui/src/app/views/admin/service/show/service.show.html +++ b/ui/src/app/views/admin/service/show/service.show.html @@ -3,47 +3,38 @@
-
- {{'service_alert' | translate}} -
- -
- {{'service_warning' | translate}} -
- -
- {{'service_ok' | translate}} -
- + + + -

Heartbeat

+

Heartbeat

{{service.last_heartbeat | amTimeAgo}}

-

Version

+

Version

{{service.version}}

-

Status

+

Status

-

Configuration

+

Configuration

 -
{{ 'common_loading' | translate }}
+
diff --git a/ui/src/app/views/admin/service/show/service.show.scss b/ui/src/app/views/admin/service/show/service.show.scss index f23962edbb..4fc770d990 100644 --- a/ui/src/app/views/admin/service/show/service.show.scss +++ b/ui/src/app/views/admin/service/show/service.show.scss @@ -2,3 +2,11 @@ .code { width: 100%; } + +nz-alert { + margin-bottom: 15px; +} + +nz-spin { + margin-top: 30px; +} diff --git a/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.html b/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.html index 770702ba1d..588f42e39a 100644 --- a/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.html +++ b/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.html @@ -1,9 +1,10 @@
- {{ 'btn_add' | translate - }} + + -
\ No newline at end of file +
diff --git a/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.scss b/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.scss index 153e0d0de2..d9621a1583 100644 --- a/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.scss +++ b/ui/src/app/views/admin/worker-model-pattern/list/worker-model-pattern.list.scss @@ -1 +1,6 @@ @import '../../../../../common'; + +.buttonBreadcrumb { + float: right; + margin-top: 8px; +} diff --git a/ui/src/app/views/environment/add/environment.add.html b/ui/src/app/views/environment/add/environment.add.html index 045ba3dcf8..9b8c2ab738 100644 --- a/ui/src/app/views/environment/add/environment.add.html +++ b/ui/src/app/views/environment/add/environment.add.html @@ -1,41 +1,34 @@
- -
-

{{ 'environment_create' | translate }}

- -
-
-
-
- - -
- {{ 'environment_name_error' | translate }} -
-
-
-
-
-
-
- {{ - 'btn_cancel' | translate }} - + + + + -
-
- -
-
- + + +
-
diff --git a/ui/src/app/views/environment/add/environment.add.scss b/ui/src/app/views/environment/add/environment.add.scss index f491b3a342..052d0436d9 100644 --- a/ui/src/app/views/environment/add/environment.add.scss +++ b/ui/src/app/views/environment/add/environment.add.scss @@ -9,4 +9,8 @@ h2 { text-align: center; } + + nz-alert { + margin-top: 10px; + } } diff --git a/ui/src/app/views/environment/show/environment.show.html b/ui/src/app/views/environment/show/environment.show.html index 8dde9bf70f..2eefc65dbd 100644 --- a/ui/src/app/views/environment/show/environment.show.html +++ b/ui/src/app/views/environment/show/environment.show.html @@ -1,6 +1,7 @@ +
-
+
@@ -52,9 +53,7 @@

{{ 'environment_variable_list_title' | translate}}

-
- {{ 'environment_no_usage' | translate }} -
+
@@ -65,8 +64,8 @@

{{ 'environment_variable_list_title' | translate}}

-
-
Loading environment...
+ + diff --git a/ui/src/app/views/environment/show/environment.show.scss b/ui/src/app/views/environment/show/environment.show.scss index 2a82d07101..b679332590 100644 --- a/ui/src/app/views/environment/show/environment.show.scss +++ b/ui/src/app/views/environment/show/environment.show.scss @@ -30,3 +30,7 @@ } } +nz-spin { + margin-top: 30px; +} + diff --git a/ui/src/app/views/favorite/favorite.component.html b/ui/src/app/views/favorite/favorite.component.html index eecef54ed0..11b8b36187 100644 --- a/ui/src/app/views/favorite/favorite.component.html +++ b/ui/src/app/views/favorite/favorite.component.html @@ -1,18 +1,16 @@
-

{{ 'favorite_title' | translate }}

-
-
-
-
-
+

Bookmarks management

+ + -
-
-
+ + -
- {{'common_no_favorites' | translate}} -
+ + + + + -
{{ 'common_loading' | translate }}
+
diff --git a/ui/src/app/views/favorite/favorite.component.scss b/ui/src/app/views/favorite/favorite.component.scss index 834c2d4805..9282f4e7a7 100644 --- a/ui/src/app/views/favorite/favorite.component.scss +++ b/ui/src/app/views/favorite/favorite.component.scss @@ -3,5 +3,6 @@ overflow: auto; h1 { margin: 1em; + text-align: center; } } diff --git a/ui/src/app/views/project/show/permission/permission.html b/ui/src/app/views/project/show/permission/permission.html index c73706e01b..02d0bd546e 100644 --- a/ui/src/app/views/project/show/permission/permission.html +++ b/ui/src/app/views/project/show/permission/permission.html @@ -1,12 +1,13 @@

{{ 'project_permission_list_title' | translate }}

-
+ + Following groups that are not from organization "{{project.organization}}" can read the project: {{gp.group.name}} - ({{gp.group.organization}}){{ i < groupsOutsideOrganization.length - 1 ? ', ' : '' }}. -
+ ({{gp.group.organization}}){{ i < groupsOutsideOrganization.length - 1 ? ', ' : '' }}. + @@ -14,7 +15,7 @@

{{ 'project_permission_form_title' | translate }}

 -
{{'common_loading_environments' | translate}}...
+
Do you want to propagate your new permission to all your existing workflows ? diff --git a/ui/src/app/views/project/show/project.html b/ui/src/app/views/project/show/project.html index 5cfbba1b24..1e369e851d 100644 --- a/ui/src/app/views/project/show/project.html +++ b/ui/src/app/views/project/show/project.html @@ -11,13 +11,14 @@ +
-
+
-
+
@@ -63,8 +64,8 @@

{{ 'project_advanced_title' | translate }}

- -
{{'common_loading_project' | translate}}
+ + diff --git a/ui/src/app/views/project/show/project.scss b/ui/src/app/views/project/show/project.scss index 86edac6b19..bb39039e17 100644 --- a/ui/src/app/views/project/show/project.scss +++ b/ui/src/app/views/project/show/project.scss @@ -23,4 +23,8 @@ } } } + nz-spin { + margin-top: 30px; + } } + diff --git a/ui/src/app/views/settings/user/consumer-details-modal/consumer-details-modal.component.ts b/ui/src/app/views/settings/user/consumer-details-modal/consumer-details-modal.component.ts index a6c404c009..33188bf89d 100644 --- a/ui/src/app/views/settings/user/consumer-details-modal/consumer-details-modal.component.ts +++ b/ui/src/app/views/settings/user/consumer-details-modal/consumer-details-modal.component.ts @@ -49,7 +49,7 @@ export class ConsumerDetailsModalComponent implements OnInit { filterChildren: Filter; selectedChildDetails: AuthConsumer; menuItems: Map; - selectedItem: String; + selectedItem: string; columnsSessions: Array>; filterSessions: Filter; consumerDeletedOrDetached: boolean; diff --git a/ui/src/app/views/workflow/run/node/node.html b/ui/src/app/views/workflow/run/node/node.html index e1601630c0..943f0d92b1 100644 --- a/ui/src/app/views/workflow/run/node/node.html +++ b/ui/src/app/views/workflow/run/node/node.html @@ -28,4 +28,4 @@ -
{{ 'pipeline_loading' | translate }}
+ diff --git a/ui/src/app/views/workflow/run/node/node.scss b/ui/src/app/views/workflow/run/node/node.scss index a5357f8ebd..1eb9809ee4 100644 --- a/ui/src/app/views/workflow/run/node/node.scss +++ b/ui/src/app/views/workflow/run/node/node.scss @@ -8,3 +8,7 @@ height: 100%; } } + +nz-spin { + margin-top: 30px; +} diff --git a/ui/src/app/views/workflow/run/node/pipeline/pipeline.html b/ui/src/app/views/workflow/run/node/pipeline/pipeline.html index 29e7bff4a7..863295cac9 100644 --- a/ui/src/app/views/workflow/run/node/pipeline/pipeline.html +++ b/ui/src/app/views/workflow/run/node/pipeline/pipeline.html @@ -1,7 +1,7 @@
+ #scrollContent>
@@ -12,67 +12,67 @@
-
-
-
-
    -
  • -
    - {{stage.name}} -
      -
    • -
      -
      - -
      -
      - + +
        +
      • +
        + {{stage.name}} +
          +
        • +
          +
          + +
          +
          + - - {{j.action.name}} -
          -
          + + {{j.action.name}} +
          +
          - {{ 'workflow_run_node_job_queued' | translate: {time: - jobTime?.get(j.pipeline_action_id)} }} + *ngIf="mapJobStatus?.get(j.pipeline_action_id)?.status === pipelineStatusEnum.WAITING"> + {{ 'workflow_run_node_job_queued' | translate: { + time: + jobTime?.get(j.pipeline_action_id) + } }} - {{jobTime?.get(j.pipeline_action_id)}} -
          -
          • -
        +
        +
        • +
      -
      -
      • -
      - {{ 'pipeline_stage_no' | translate }}
      -
    -
    -
-
-
- -
+ + + + + +
+
+
diff --git a/ui/src/app/views/workflow/run/node/pipeline/pipeline.scss b/ui/src/app/views/workflow/run/node/pipeline/pipeline.scss index 4831108300..9250425ecc 100644 --- a/ui/src/app/views/workflow/run/node/pipeline/pipeline.scss +++ b/ui/src/app/views/workflow/run/node/pipeline/pipeline.scss @@ -110,9 +110,10 @@ } } - .job.ui.segment { + .job.nzSegment { height: 51px; padding: 0; + border: 2px solid transparent; .title { padding: 5px; @@ -132,7 +133,7 @@ .duration { position: absolute; right: 4px; - bottom: -3px; + bottom: 4px; color: gray; font-size: 0.8rem; font-weight: 600; @@ -140,17 +141,13 @@ .warningPip { position: absolute; - right: 0px; - top: 2px; + right: 4px; + top: 4px; font-size: 1rem; } } - .job.ui.segment { - border: 2px solid transparent; - } - - .job.ui.segment.active { + .job.nzSegment.active { border: 2px solid $cds_color_teal; } } @@ -221,3 +218,7 @@ } } } + +.orange { + color: $cds_color_orange; +} diff --git a/ui/src/app/views/workflow/run/node/pipeline/workflow-run-job/workflow-run-job.html b/ui/src/app/views/workflow/run/node/pipeline/workflow-run-job/workflow-run-job.html index 8446b1b9c0..995054ee79 100644 --- a/ui/src/app/views/workflow/run/node/pipeline/workflow-run-job/workflow-run-job.html +++ b/ui/src/app/views/workflow/run/node/pipeline/workflow-run-job/workflow-run-job.html @@ -21,7 +21,7 @@
-
+ {{step.firstDisplayedLineNumber ? step.firstDisplayedLineNumber : ''}}
{{step.name}}
diff --git a/ui/src/app/views/workflow/run/node/summary/run.summary.html b/ui/src/app/views/workflow/run/node/summary/run.summary.html index c5c12b796e..72f23ae918 100644 --- a/ui/src/app/views/workflow/run/node/summary/run.summary.html +++ b/ui/src/app/views/workflow/run/node/summary/run.summary.html @@ -1,19 +1,17 @@
-
-
-
-
-
+ +
-
-
-
+ {{workflow.pipelines[node.context.pipeline_id].name + ' ' + nodeRunNum + '.' + nodeRunSubNum}} -
-
+ {{nodeRunStart | amLocal | amDateFormat: 'DD/MM/YYYY HH:mm' }} -
-
+ +
{{duration}}
-
-
-
-
+ + + + -
-
+ + @@ -55,27 +52,25 @@ {{workflow.environments[node.context.environment_id].name}} -
-
-
-
-
+ + + +
+ *ngIf="nodeRunStatus !== pipelineStatusEnum.BUILDING && nodeRunStatus !== pipelineStatusEnum.WAITING"> + [disabled]="loading || readOnlyRun" + (click)="runNewWithParameter()">{{ 'pipeline_label_run_with_parameter' | translate }}
-
-
-
+ (click)="stop()" + *ngIf="nodeRunStatus === pipelineStatusEnum.WAITING || nodeRunStatus === pipelineStatusEnum.BUILDING">{{ 'pipeline_label_stop' | translate }} + + +
-
-
-
-
+ + +
diff --git a/ui/src/app/views/workflow/run/node/summary/run.summary.scss b/ui/src/app/views/workflow/run/node/summary/run.summary.scss index 5dfee5d9e3..93045bee67 100644 --- a/ui/src/app/views/workflow/run/node/summary/run.summary.scss +++ b/ui/src/app/views/workflow/run/node/summary/run.summary.scss @@ -29,6 +29,17 @@ .cardinfo { border-radius: 0 0 0.28571429rem 0.28571429rem; + + nz-row { + padding: 14px 14px; + } + + .rightAlign { + text-align: right; + } + .center { + text-align: center; + } } .running { @@ -59,7 +70,7 @@ border-top: none; } - .row { + nz-col { a { color: inherit; text-decoration: underline; diff --git a/ui/src/app/views/workflow/run/node/test/table/test.table.html b/ui/src/app/views/workflow/run/node/test/table/test.table.html index 090423e7e0..7bc908d9d9 100644 --- a/ui/src/app/views/workflow/run/node/test/table/test.table.html +++ b/ui/src/app/views/workflow/run/node/test/table/test.table.html @@ -1,68 +1,63 @@
-
-
-
- - {{tests.total}} - {{'pipeline_run_test_total_title_s' | translate}} - {{'pipeline_run_test_total_title' | translate}} - -
-
- - {{ tests.ko }} - {{'pipeline_run_test_failed_title_s' | translate}} - {{'pipeline_run_test_failed_title' | translate}} - -
-
- - {{ tests.skipped }} - {{'pipeline_run_test_skipped_title_s' | translate}} - {{'pipeline_run_test_skipped_title' | translate}} - -
-
-
+ + + + {{tests.total}} + {{'pipeline_run_test_total_title_s' | translate}} + {{'pipeline_run_test_total_title' | translate}} + + + + + {{ tests.ko }} + {{'pipeline_run_test_failed_title_s' | translate}} + {{'pipeline_run_test_failed_title' | translate}} + + + + + {{ tests.skipped }} + {{'pipeline_run_test_skipped_title_s' | translate}} + {{'pipeline_run_test_skipped_title' | translate}} + + +
-
-
+ + -
-
+ +

Errors / Failures / Skipped

-
- {{ 'common_no_data' | translate }} -
+ +

Systemout

-
- {{ 'common_no_data' | translate }} -
+ +

Systemerr

-
- {{ 'common_no_data' | translate }} -
+ +
-
-
+ +
diff --git a/ui/src/app/views/workflow/run/node/test/table/test.table.scss b/ui/src/app/views/workflow/run/node/test/table/test.table.scss index b0c3b38b14..9b096364fd 100644 --- a/ui/src/app/views/workflow/run/node/test/table/test.table.scss +++ b/ui/src/app/views/workflow/run/node/test/table/test.table.scss @@ -4,4 +4,8 @@ font-size: 1.1em; font-weight: 600; padding-bottom: 10px; -} \ No newline at end of file +} + +nz-alert { + margin: 10px 0; +} diff --git a/ui/src/app/views/workflow/show/workflow.html b/ui/src/app/views/workflow/show/workflow.html index ba63a87a48..d49802517f 100644 --- a/ui/src/app/views/workflow/show/workflow.html +++ b/ui/src/app/views/workflow/show/workflow.html @@ -63,12 +63,14 @@

{{ 'workflow_permission_list_title' | translate }}

-
Following groups that are not from organization + + + Following groups that are not from organization "{{detailedWorkflow.organization}}" can read the workflow: {{gp.group.name}} ({{gp.group.organization}}){{ i < groupsOutsideOrganization.length - 1 ? ', ' : '' }}. -
+ @@ -98,7 +100,7 @@

{{ 'workflow_permission_form_title' | translate }}

-
Loading workflow...
+ diff --git a/ui/src/app/views/workflow/show/workflow.scss b/ui/src/app/views/workflow/show/workflow.scss index f1aff679c4..d389acd6e8 100644 --- a/ui/src/app/views/workflow/show/workflow.scss +++ b/ui/src/app/views/workflow/show/workflow.scss @@ -38,3 +38,11 @@ margin-top: 7px; } } + +nz-spin { + margin-top: 30px; +} + +nz-alert { + margin-bottom: 10px; +} diff --git a/ui/src/app/views/workflow/sidebar/code/sidebar.code.html b/ui/src/app/views/workflow/sidebar/code/sidebar.code.html index debdcfb527..250a15e40c 100644 --- a/ui/src/app/views/workflow/sidebar/code/sidebar.code.html +++ b/ui/src/app/views/workflow/sidebar/code/sidebar.code.html @@ -1,29 +1,31 @@ -
-
+
+ + + [(ngModel)]="exportedWf" + (keydown)="updated = true; keyEvent($event)" + [config]="codeMirrorConfig" #codeMirror> -
-
-
- -
-
- -
-
- -
-
+ +
-
-
{{ 'common_loading' | translate }}
+ +
diff --git a/ui/src/app/views/workflow/sidebar/code/sidebar.code.scss b/ui/src/app/views/workflow/sidebar/code/sidebar.code.scss index 1d0bf2906a..5dba59cc7e 100644 --- a/ui/src/app/views/workflow/sidebar/code/sidebar.code.scss +++ b/ui/src/app/views/workflow/sidebar/code/sidebar.code.scss @@ -1,5 +1,12 @@ .codebar { + position: fixed; + top: 0; + right: 0; + left: auto; z-index: unset; + height: 100%; + width: 0%; + &.visible { width: 50%; } @@ -12,6 +19,7 @@ .fullheight { height: 87%; + width: 100%; } .mt5 { @@ -19,16 +27,20 @@ } .bottomBtnsWrapper { - position: fixed; + position: absolute; bottom: 100px; right: 0; width: 430px; padding-top: 20px; padding-bottom: 20px; - .column { + nz-row { + padding: 0 20px; + nz-col { padding-top: 5px; padding-bottom: 5px; + } } + } } diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json index dc0caea9ab..69b6d2dd8d 100644 --- a/ui/src/assets/i18n/en.json +++ b/ui/src/assets/i18n/en.json @@ -113,7 +113,6 @@ "common_filter": "Search...", "common_loading": "Loading...", "common_loading_project": "Loading project...", - "common_loading_environments": "Loading environments", "common_see": "see", "common_name": "Name", "common_group": "Group", @@ -154,9 +153,7 @@ "common_done": "Done", "common_error": "Error", "common_favorites_updated": "Bookmarks updated with success", - "common_no_favorites": "You didn't add projects or workflows in your bookmarks yet.", "common_favorites_all": "All bookmarks", - "common_no_data": "No data found", "common_created_by": "Created By", "common_last_modified": "Last modified", "common_up_to_date": "Up to date", @@ -193,15 +190,12 @@ "environment_deleted": "Environment deleted", "environment_from_repository": "Environment imported from {{repo}}", "environment_name": "Environment name", - "environment_no": "There is no environment", "environment_renamed": "Environment renamed", "environment_variable_form_title": "Add a variable", "environment_variable_list_title": "Variables list", - "environment_no_usage": "This environment is not used", "environment_delete_label": "Delete environment", "environment_delete_description": "Once you delete an environment, there is no going back. Please be certain.", "filter": "Filter", - "favorite_title": "Bookmarks management", "favorite_add": "Add a bookmark", "favorite_add_btn": "Add to my bookmarks", "graph_vulnerability_title": "Vulnerabilities", @@ -283,7 +277,6 @@ "pipeline_job_variable_workflow": "Workflow variables", "pipeline_label_run_with_parameter": "Run pipeline with parameters", "pipeline_label_stop": "Stop pipeline", - "pipeline_loading": "Loading pipeline...", "pipeline_name": "Pipeline name", "pipeline_description": "Pipeline description", "pipeline_from_repository": "Imported from {{repo}}", @@ -300,7 +293,6 @@ "pipeline_run_test_skipped_title_s": " tests skipped", "pipeline_run_test_skipped_title": " test skipped", "pipeline_stage_moved": "Stage moved", - "pipeline_stage_no": "The pipeline has no stage", "project_list": "All projects", "project_advanced_title": "Project administration", "project_added": "Project has just been created", @@ -454,7 +446,6 @@ "worker_model_saved": "Worker model saved", "worker_model_pattern_saved": "Pattern saved", "worker_model_pattern_deleted": "Pattern deleted", - "worker_model_status": "Status", "worker_model_pattern_title": "Patterns of configuration scripts", "worker_model_post_cmd": "Post worker command", "worker_model_no_usage": "This worker model is not explicitly used in a pipeline", @@ -487,7 +478,6 @@ "workflow_node_delete_alert": "BE CAREFUL, this will remove the pipeline and all his children", "workflow_node_delete_alert_soft": "Remove only this one", "workflow_node_hook_select": "Select a hook type", - "workflow_node_hook_form_config": "Hook configuration", "workflow_node_outgoing_hook": "Add an outgoing hook", "workflow_node_permissions_form_title": "Add a permission", "workflow_permission_list_title": "List workflow permissions",