Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create New Story/Create New Group are fixed, the scroll is visible #492

Merged
merged 5 commits into from
Nov 24, 2023
Merged

Create New Story/Create New Group are fixed, the scroll is visible #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5090f7b
Create New Story/Create New Group are fixed, the scroll is visible
nkarmazina Nov 9, 2023
471f48e
Fixed the length in Github/Jira
nkarmazina Nov 14, 2023
aec6909
fixed scrollbars
nkarmazina Nov 16, 2023
b2f93c9
Merge remote-tracking branch 'origin/dev' into CUC-517
nkarmazina Nov 23, 2023
7539f5e
changes after merge
nkarmazina Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions frontend/src/app/stories-bar/stories-bar.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.grid {
/*display: grid;
/*display: grid;
grid-template-columns: 100%;
grid-template-rows: auto;
grid-template-areas: "storyHeader" "storyList";*/
Expand All @@ -10,8 +10,10 @@
padding-bottom: 1px;
box-shadow: 0px 5px 15px rgba(0,0,0,0.08);
background-color: var(--white);
overflow-y: scroll;
max-height: 88vmin;
margin-bottom: 20px;
height: 88vmin;
display: block;

}

.darkTheme.grid {
Expand All @@ -22,6 +24,26 @@
.uk-background-muted {
background-color: #f8f8f8;
}
mat-tab-group{
height: calc(100% - 65px);
}

.itemListDiv{
height: calc(100% - 125px);
}

.storyListDivNotCustom{
height: calc(100% - 110px);
}

.storyListDivWithFilter{
height: calc(100% - 185px);
}

.itemListDiv>ul, .storyListDivNotCustom>ul, .storyListDivWithFilter>ul{
height: 100%;
overflow: scroll;
}

.darkTheme.uk-background-muted {
background-color: #546E7A
Expand Down Expand Up @@ -317,7 +339,6 @@ a.storyListLink:hover{
"storyList";
}
}

.darkTheme .uk-accordion-title::before {
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMThweCIgdmlld0JveD0iMCAwIDI0IDI0IiB3aWR0aD0iMThweCIgZmlsbD0iI0ZGRkZGRiI+PHBhdGggZD0iTTAgMGgyNHYyNEgwVjB6IiBmaWxsPSJub25lIi8+PHBhdGggZD0iTTE5IDEzaC02djZoLTJ2LTZINXYtMmg2VjVoMnY2aDZ2MnoiLz48L3N2Zz4=);
width: 19px;
Expand All @@ -330,11 +351,13 @@ a.storyListLink:hover{
height: 19px;
}

::-webkit-scrollbar-thumb,
.darkTheme::-webkit-scrollbar-thumb {
.darkTheme ::-webkit-scrollbar-corner{
background: none !important;
box-shadow: none !important;
}
::-webkit-scrollbar{
width: 10px; /* Adjust the width as needed */
}

.tab-icon{
color: var(--brown-grey);
margin-bottom: 12px;
Expand Down
108 changes: 55 additions & 53 deletions frontend/src/app/stories-bar/stories-bar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,44 +61,43 @@
</mat-form-field>
</div>
<hr>
<ul uk-accordion (cdkDropListDropped)="dropStory($event)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let s of getSortedStories(); let i = index" cdkDrag>
<div id="storyList" (click)="selectStoryScenario(s)" class="Mediumaccordeon2 uk-accordion-title" >
<div [class.itemListDiv]="this.stories?.length !== 0 && isCustomStory" [class.storyListDivNotCustom]="this.stories?.length !== 0 && !isCustomStory" [class.storyListDivWithFilter]="showFilter">
<ul uk-accordion (cdkDropListDropped)="dropStory($event)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let s of getSortedStories(); let i = index" cdkDrag >
<div id="storyList" (click)="selectStoryScenario(s)" class="Mediumaccordeon2 uk-accordion-title" >
<span *ngIf="!isCustomStory" class="jiraGithubStoryIcons">
<!--<img src="assets/unassigned_avatar.png" alt="assignee github avatar" width="20px" height="20px" uk-tooltip="pos:right; delay: 200" title="Unassigned">-->
<button uk-tooltip="Go to Jira/Github" class="toTicket" (click)="toTicket(s.issue_number)">
<mat-icon class="toTicket">launch</mat-icon>
</button>
<img *ngIf="s.assignee_avatar_url == null || this.daisyVersion" src="assets/unassigned_avatar.png" alt="assignee github avatar" width="20px" height="20px" uk-tooltip="pos:right; delay: 200" title="Unassigned">
<img *ngIf="!this.daisyVersion && s.assignee_avatar_url != null " [src]=s.assignee_avatar_url alt="assignee github avatar" width="20px" height="20px" uk-tooltip="pos:right; delay: 200" title="{{s.assignee}}">
</span>
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
<a class="storyListLink" maxlength="10" id="{{'story' + i}}" uk-tooltip="pos:right; delay: 200" title="{{s.title}}">
{{s.issue_number}}. {{s.title}}
</a>
</div>
<div id="scenarioList" class="uk-accordion-content">
<ul (cdkDropListDropped)="dropScenario($event, s)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let scen of s.scenarios; let c = index">
<a class="Largecaption scenarioListItem" [class.notPassed]="!scen.lastTestPassed && scen.lastTestPassed != undefined" [class.passed]="scen.lastTestPassed && scen.lastTestPassed != undefined" [class.notTested] ="" (click)="selectScenario(scen);" id="{{'scenario' + c}}" cdkDrag>
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
#{{s.issue_number}}.{{c+1}} {{scen.name | titlecase}}
<mat-icon class="icon passed" *ngIf="scen.lastTestPassed && scen.lastTestPassed != undefined">check_circle_outline</mat-icon>
<mat-icon class="icon notPassed" *ngIf="!scen.lastTestPassed && (scen.lastTestPassed != undefined)">report</mat-icon>
<mat-icon class="icon undefined" *ngIf="scen.lastTestPassed == undefined">watch_later</mat-icon>
</a>
</li>
</ul>
<button id="add_first_scenario" class="SmallButton" *ngIf="!(s.scenarios.length>0)" (click)="openCreateNewScenarioModal()">Create First Scenario</button>
<button id="add_scenario" *ngIf="s.scenarios.length>0" class="material-icons" uk-tooltip="Add New Scenario" (click)="openCreateNewScenarioModal()">add</button>
</div>
</li>
</ul>
<div *ngIf="isCustomStory" id="createNewStoryDiv">
<button class="normalButton" (click)="openCreateNewStoryModal()">Create New Story</button>
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
<a class="storyListLink" maxlength="10" id="{{'story' + i}}" uk-tooltip="pos:right; delay: 200" title="{{s.title}}">
{{s.issue_number}}. {{s.title}}
</a>
</div>
<div id="scenarioList" class="uk-accordion-content">
<ul (cdkDropListDropped)="dropScenario($event, s)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let scen of s.scenarios; let c = index">
<a class="Largecaption scenarioListItem" [class.notPassed]="!scen.lastTestPassed && scen.lastTestPassed != undefined" [class.passed]="scen.lastTestPassed && scen.lastTestPassed != undefined" [class.notTested] ="" (click)="selectScenario(scen);" id="{{'scenario' + c}}" cdkDrag>
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
#{{s.issue_number}}.{{c+1}} {{scen.name | titlecase}}
<mat-icon class="icon passed" *ngIf="scen.lastTestPassed && scen.lastTestPassed != undefined">check_circle_outline</mat-icon>
<mat-icon class="icon notPassed" *ngIf="!scen.lastTestPassed && (scen.lastTestPassed != undefined)">report</mat-icon>
<mat-icon class="icon undefined" *ngIf="scen.lastTestPassed == undefined">watch_later</mat-icon>
</a>
</li>
</ul>
<button id="add_first_scenario" class="SmallButton" *ngIf="!(s.scenarios.length>0)" (click)="openCreateNewScenarioModal()">Create First Scenario</button>
<button id="add_scenario" *ngIf="s.scenarios.length>0" class="material-icons" uk-tooltip="Add New Scenario" (click)="openCreateNewScenarioModal()">add</button>
</div>
</li>
</ul>
</div>
<br>
<hr>
<div *ngIf="isCustomStory" id="createNewStoryDiv">
<button class="normalButton" (click)="openCreateNewStoryModal()">Create New Story</button>
</div>
</mat-tab>
<mat-tab label="Groups">
<ng-template mat-tab-label>
Expand All @@ -116,34 +115,37 @@
<em class="material-icons" id="eraseIcon" (click)="eraseSearchTerm('group')">close</em>
</div>
<hr>
<ul uk-accordion (cdkDropListDropped)="dropGroup($event)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let g of getSortedGroups(); let i = index " class="{{liGroupList[i]}}" cdkDrag>
<div id="groupList" class=" Mediumaccordeon2 uk-accordion-title" (click)="selectFirstStoryOfGroup(g)">
<a class="storyListLink groupLinkList" maxlength="10" id="{{'group' + i}}" uk-tooltip="pos:right; delay: 200"
title="{{g.name}}">
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
{{g.name}}
</a>
<span class="groupIconSpan">
<em class="material-icons" uk-tooltip title="Run Tests in Group" (click)="selectFirstStoryOfGroup(g);runGroup(g);$event.stopPropagation();" id="groupPlay">play_arrow</em>
<em class="material-icons" uk-tooltip title="Update Group" (click)="openUpdateGroupModal(g);$event.stopPropagation();" id="groupEdit">edit</em>
</span>
</div>
<ul class="uk-accordion-content" (cdkDropListDropped)="dropGroupStory($event, g)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let stor of g.member_stories" (click)="selectStoryOfGroup(stor._id)">
<a class="Largecaption scenarioListItem" cdkDrag>
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
{{stor.title | titlecase}}
</a>
</li>
</ul>
</li>
</ul>
<div [class.itemListDiv]="this.groups?.length !== 0 && this.groups?.length !== null">
<ul uk-accordion (cdkDropListDropped)="dropGroup($event)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let g of getSortedGroups(); let i = index " class="{{liGroupList[i]}}" cdkDrag>
<div id="groupList" class=" Mediumaccordeon2 uk-accordion-title" (click)="selectFirstStoryOfGroup(g)">
<a class="storyListLink groupLinkList" maxlength="10" id="{{'group' + i}}" uk-tooltip="pos:right; delay: 200"
title="{{g.name}}">
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
{{g.name}}
</a>
<span class="groupIconSpan">
<em class="material-icons" uk-tooltip title="Run Tests in Group" (click)="selectFirstStoryOfGroup(g);runGroup(g);$event.stopPropagation();" id="groupPlay">play_arrow</em>
<em class="material-icons" uk-tooltip title="Update Group" (click)="openUpdateGroupModal(g);$event.stopPropagation();" id="groupEdit">edit</em>
</span>
</div>
<ul class="uk-accordion-content" (cdkDropListDropped)="dropGroupStory($event, g)" cdkDropList cdkDropListLockAxis="y">
<li *ngFor="let stor of g.member_stories" (click)="selectStoryOfGroup(stor._id)">
<a class="Largecaption scenarioListItem" cdkDrag>
<em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
{{stor.title | titlecase}}
</a>
</li>
</ul>
</li>
</ul>
</div>
<div id="createNewGroupDiv">
<button class="normalButton" (click)="openCreateNewGroupModal()">Create New Group</button>
</div>
</mat-tab>
</mat-tab-group>
<hr>
</div>
<app-create-new-group #createNewGroup></app-create-new-group>
<app-create-new-story #createNewStory></app-create-new-story>
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,10 @@ a:hover {
background: map-get($mat-brown-palette, 200);
}

.mdc-menu-surface::-webkit-scrollbar-thumb {
background: none !important;
}

.darkTheme ::-webkit-scrollbar-thumb,
.darkTheme::-webkit-scrollbar-thumb {
background: map-get($mat-blue-gray-palette, 200) !important;
Expand Down
Loading