Skip to content

Commit 0fddac4

Browse files
committed
fix(ui): Make scenario table responsive in campaign edition
1 parent 839f01b commit 0fddac4

File tree

2 files changed

+58
-47
lines changed

2 files changed

+58
-47
lines changed

chutney/ui/src/app/modules/campaign/components/create-campaign/campaign-edition.component.html

Lines changed: 53 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -139,57 +139,64 @@ <h4 id="myCampaignLabel">
139139
<!-- Left side -->
140140
<div class="col-md-6">
141141
<table class="table table-striped table-hover">
142-
<thead>
143-
<th colspan="4">
144-
{{ 'campaigns.edition.scenarios.title' | translate }}
145-
</th>
146-
<th class="text-center pe-5">
147-
@if (datasets.length > 0) {
148-
Dataset
149-
}
142+
<thead class="w-100">
143+
<th class="w-100 d-flex justify-content-between">
144+
<div>
145+
{{ 'campaigns.edition.scenarios.title' | translate }}
146+
</div>
147+
<div class="text-center dataset-header">
148+
@if (datasets.length > 0) {
149+
Dataset
150+
}
151+
</div>
150152
</th>
151-
<th></th>
152153
</thead>
153154
<tbody dragula="DRAGGABLE" [(dragulaModel)]="scenariosToAdd">
154155
@for (scenario of scenariosToAdd; track scenario) {
155-
<tr class="cursor">
156-
<td class="text-nowrap">{{scenario?.scenarioId.id}}</td>
157-
<td class="scenario-title-cell">{{scenario?.scenarioId.title}}</td>
158-
<td class="p-0">
159-
@if (jiraMap.has(scenario.id)) {
160-
<span
161-
[ngClass]="getJiraLastExecutionStatusClass(scenario.scenarioId.id)" class="badge">
162-
{{getJiraLastExecutionStatus(scenario.scenarioId.id)}}
163-
</span>
164-
}
165-
</td>
166-
<td class="p-0">
167-
@if (jiraMap.has(scenario.id)) {
168-
<a role="button" class="btn btn-sm btn-link me-0"
169-
target="_blank" href="{{getJiraLink(scenario.scenarioId.id)}}" rel="noopener noreferrer"
170-
ngbPopover="{{jiraMap.get(scenario.scenarioId.id)}}" placement="left" (click)="$event.stopPropagation()"
171-
triggers="mouseenter:mouseleave">
172-
<span class="fab fa-jira" aria-hidden="true">
173-
</span>
174-
</a>
175-
}
176-
</td>
177-
<td class="pe-5">
178-
@if (datasets.length > 0) {
179-
<ng-multiselect-dropdown
180-
[settings]="dropdownDatasetSettings"
181-
class="dataset-combo"
182-
[placeholder]="'campaigns.edition.selectDatasetScenario' | translate"
183-
[data]="datasets"
184-
[ngModel]="scenario.dataset === null ? [] : [scenario.dataset]"
185-
[ngModelOptions]="{standalone: true}"
186-
(onSelect)="selectDatasetScenario($event, scenario)"
187-
(onDeSelect)="deselectDatasetScenario(scenario)">
188-
</ng-multiselect-dropdown>
189-
}
156+
<tr class="cursor w-100">
157+
<td class="w-100">
158+
<div class="w-100 d-flex justify-content-between align-items-center flex-wrap">
159+
<div class="d-flex flex-row">
160+
<div class="text-nowrap me-4">{{scenario?.scenarioId.id}}</div>
161+
<div class="scenario-title-cell w-100 me-2">{{scenario?.scenarioId.title}}</div>
162+
</div>
163+
<div class="p-0">
164+
@if (jiraMap.has(scenario.id)) {
165+
<span
166+
[ngClass]="getJiraLastExecutionStatusClass(scenario.scenarioId.id)" class="badge">
167+
{{getJiraLastExecutionStatus(scenario.scenarioId.id)}}
168+
</span>
169+
}
170+
</div>
171+
<div class="p-0">
172+
@if (jiraMap.has(scenario.id)) {
173+
<a role="button" class="btn btn-sm btn-link me-0"
174+
target="_blank" href="{{getJiraLink(scenario.scenarioId.id)}}" rel="noopener noreferrer"
175+
ngbPopover="{{jiraMap.get(scenario.scenarioId.id)}}" placement="left" (click)="$event.stopPropagation()"
176+
triggers="mouseenter:mouseleave">
177+
<span class="fab fa-jira" aria-hidden="true">
178+
</span>
179+
</a>
180+
}
181+
</div>
182+
<div class="p-0 me-2">
183+
@if (datasets.length > 0) {
184+
<ng-multiselect-dropdown
185+
[settings]="dropdownDatasetSettings"
186+
class="dataset-combo"
187+
[placeholder]="'campaigns.edition.selectDatasetScenario' | translate"
188+
[data]="datasets"
189+
[ngModel]="scenario.dataset === null ? [] : [scenario.dataset]"
190+
[ngModelOptions]="{standalone: true}"
191+
(onSelect)="selectDatasetScenario($event, scenario)"
192+
(onDeSelect)="deselectDatasetScenario(scenario)">
193+
</ng-multiselect-dropdown>
194+
}
195+
</div>
196+
</div>
190197
</td>
191-
<td class="p-0">
192-
<button type="button" class="btn btn-outline-primary btn-sm me-2"
198+
<td>
199+
<button type="button" class="btn btn-outline-primary btn-sm "
193200
(click)="removeScenario(scenario)">
194201
<span class="fa fa-arrow-circle-right"></span>
195202
</button>

chutney/ui/src/app/modules/campaign/components/create-campaign/campaign-edition.component.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ span.search-field {
3434
}
3535

3636

37+
.dataset-header {
38+
margin-right: 100px;
39+
}
40+
3741
fieldset {
3842
width: 100%;
3943
}
@@ -99,4 +103,4 @@ fieldset legend {
99103
.dataset-combo {
100104
min-width:200px;
101105
display: inline-block;
102-
}
106+
}

0 commit comments

Comments
 (0)