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.

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

KMCNG-1787 #735

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ export class CategoriesBulkActionsComponent implements OnInit, OnDestroy {
id: 'addRemoveTags',
label: this._appLocalization.get('applications.content.categories.bActions.addRemoveTags'), items: [
{ label: this._appLocalization.get('applications.content.categories.bActions.addTags'),
command: () => { this.openBulkActionWindow('addTags', 500, 500) } },
command: () => { this.openBulkActionWindow('addTags', 586, 369) } },
{ label: this._appLocalization.get('applications.content.categories.bActions.removeTags'),
command: () => { this.openBulkActionWindow('removeTags', 500, 500) } }]
command: () => { this.openBulkActionWindow('removeTags', 586, 369) } }]
}
];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
<k-area-blocker [showLoader]="_loading" [message]="_sectionBlockerMessage">
<div class="kContent kOverrideFAIcons">
<span class="kTitle">{{'applications.content.categories.bActions.addTags' | translate}}</span>
<div class="kTags">
<span class="kLabel">{{'applications.content.categories.bActions.addTagsLabel' | translate}}</span>
<kAutoComplete [(ngModel)]="tags"
suggestionItemField="item"
suggestionSelectableField="isSelectable"
[multiple]="true"
[limitToSuggestions]="false"
[minLength]="3"
[suggestionsProvider]="_tagsProvider"
(completeMethod)="_searchTags($event)">
</kAutoComplete>
<div class="kContent kOverrideFAIcons">
<span class="kTitle">{{'applications.content.categories.bActions.addTags' | translate}}</span>
<div class="kTags">
<div class="kLabel">{{'applications.content.categories.bActions.addTagsLabel' | translate}}</div>
<kAutoComplete [(ngModel)]="tags"
suggestionItemField="item"
suggestionSelectableField="isSelectable"
[multiple]="true"
[limitToSuggestions]="false"
[minLength]="3"
[suggestionsProvider]="_tagsProvider"
(completeMethod)="_searchTags($event)">
</kAutoComplete>
</div>
<div class="kFooter">
<button type="button" class="kButtonDefault" pButton
[label]="'applications.content.bulkActions.cancel' | translate"
(click)="parentPopupWidget?.close()"></button>
<button type="button" class="kButtonBranded" pButton
[disabled]="!tags.length"
[label]="'applications.content.bulkActions.addTagsBtn' | translate:[tags.length || '']"
(click)="_apply()"></button>
</div>
</div>
<div class="kFooter">
<button type="button" class="kButtonBranded" pButton label="{{'applications.content.categories.bActions.save' | translate}}" (click)="_apply()"></button>
</div>
</div>
</k-area-blocker>
Original file line number Diff line number Diff line change
@@ -1,58 +1,68 @@
@import "app-theme/_variables.scss";

.kTitle{
color: $kGrayscale1;
font-size: 24px;
font-weight: 700;
text-align: center;
border-bottom: 1px solid $kGrayscale4;
height: 78px;
line-height: 78px;
.kTitle {
color: $kGrayscale1;
font-size: 24px;
font-weight: 700;
text-align: center;
border-bottom: 1px solid $kGrayscale4;
height: 78px;
line-height: 78px;
}
.kContent{
display: flex;
flex-direction: column;
height: 500px;
.kLabel{
display: block;
margin-bottom: 8px;
}
.kTags{
padding: 12px;
height: 330px;
overflow: hidden;
}

.kContent {
display: flex;
flex-direction: column;
height: 369px;
.kLabel {
margin-right: 42px;
width: 120px;
}
.kTags {
padding: 32px 28px;
height: 225px;
display: flex;
}

}
.kFooter{
position: absolute;
bottom: 0px;
display: flex;
width: 100%;
height: 66px;
border-top: 1px solid $kGrayscale4;
align-items: center;
justify-content: center;

.kFooter {
position: absolute;
bottom: 0px;
display: flex;
width: 100%;
height: 66px;
border-top: 1px solid $kGrayscale4;
align-items: center;
justify-content: center;

button {
width: 140px;
height: 34px;
&:last-child {
margin-left: 24px;
}
}
}

:host /deep/ kautocomplete {
.ui-autocomplete {
width: 475px;
}
.ui-autocomplete-multiple-container {
max-height: 310px;
overflow-y: auto;
.ui-autocomplete {
width: 335px;
}
.ui-autocomplete-multiple-container {
height: 130px !important;
overflow-y: auto;

.ui-inputtext{
padding: 4px 6px;
.ui-autocomplete-input-token{
padding: 0;
input{
height: 34px;
padding-left: 8px;
width: 472px;
.ui-inputtext {
padding: 4px 6px;
.ui-autocomplete-input-token {
padding: 0;
input {
height: 130px;
width: 335px;
padding: 10px 8px;
}
}
}
}
}
}
}

Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
<k-area-blocker [showLoader]="_loading">
<div class="kContent kOverrideFAIcons">
<span class="kTitle">{{'applications.content.categories.bActions.removeTags' | translate}}</span>
<div class="kTags">
<span class="kLabel">{{'applications.content.categories.bActions.removeTagsLabel' | translate}}</span>
<span *ngIf="!tags || !tags.length" class="kNoItems">{{'applications.content.categories.bActions.noTagsToRemove' | translate}}</span>
<kAutoComplete *ngIf="tags && tags.length" [ngModel]="tags"
[tooltipResolver]="'__tooltip'"
[classField]="'__class'"
[multiple]="true"
[limitToSuggestions]="false"
readonly="true"
(onUnselect)="_removeTag($event)">
</kAutoComplete>
<div class="kContent kOverrideFAIcons">
<span class="kTitle">{{'applications.content.categories.bActions.removeTags' | translate}}</span>
<div class="kTags">
<span class="kLabel">{{'applications.content.categories.bActions.removeTagsLabel' | translate}}</span>
<div *ngIf="!tags || !tags.length" class="kNoItems">
{{'applications.content.categories.bActions.noTagsToRemove' | translate}}
</div>
<kAutoComplete *ngIf="tags && tags.length" [ngModel]="tags"
[tooltipResolver]="'__tooltip'"
[classField]="'__class'"
[multiple]="true"
[limitToSuggestions]="false"
readonly="true"
(onUnselect)="_removeTag($event)">
</kAutoComplete>
</div>
<div class="kFooter">
<button type="button" class="kButtonDefault" pButton
[label]="'applications.content.bulkActions.cancel' | translate"
(click)="parentPopupWidget?.close()"></button>
<button type="button" class="kButtonBranded" pButton
[disabled]="tagsToRemove.length === 0"
[label]="'applications.content.bulkActions.apply' | translate"
(click)="_apply()"></button>
</div>
</div>
<div class="kFooter">
<button type="button" [disabled]="tagsToRemove.length === 0" class="kButtonBranded" pButton label="{{'applications.content.categories.bActions.save' | translate}}" (click)="_apply()"></button>
</div>
</div>
</k-area-blocker>
Original file line number Diff line number Diff line change
@@ -1,48 +1,75 @@
@import "app-theme/_variables.scss";

.kTitle{
color: $kGrayscale1;
font-size: 24px;
font-weight: 700;
text-align: center;
border-bottom: 1px solid $kGrayscale4;
height: 78px;
line-height: 78px;
}
.kContent{
display: flex;
flex-direction: column;
height: 500px;
.kLabel{
display: block;
margin-bottom: 12px;
}
.kTag{
margin-bottom: 12px;
}
.kTags{
padding: 12px;
height: 330px;
overflow-y: auto;
overflow-x: hidden;
}
.kNoItems {
.kTitle {
color: $kGrayscale1;
font-size: 24px;
font-weight: 700;
text-align: center;
width: 100%;
display: block;
}
border-bottom: 1px solid $kGrayscale4;
height: 78px;
line-height: 78px;
}

.kContent {
display: flex;
flex-direction: column;
height: 369px;
.kLabel {
margin-right: 42px;
width: 120px;
}
.kTag {
margin-bottom: 12px;
}
.kTags {
padding: 32px 28px;
height: 225px;
display: flex;
}
.kNoItems {
text-align: center;
width: 100%;
display: block;
}
}
.kFooter{
position: absolute;
bottom: 0px;
display: flex;
width: 100%;
height: 66px;
border-top: 1px solid $kGrayscale4;
align-items: center;
justify-content: center;

.kFooter {
position: absolute;
bottom: 0px;
display: flex;
width: 100%;
height: 66px;
border-top: 1px solid $kGrayscale4;
align-items: center;
justify-content: center;

button {
width: 140px;
height: 34px;
&:last-child {
margin-left: 24px;
}
}
}

:host /deep/ .ui-autocomplete {
width: 100%;
:host /deep/ kautocomplete {
.ui-autocomplete {
width: 335px;
}
.ui-autocomplete-multiple-container {
height: 130px !important;
overflow-y: auto;

.ui-inputtext {
padding: 4px 6px;
.ui-autocomplete-input-token {
padding: 0;
input {
height: 130px;
width: 335px;
padding: 10px 8px;
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,12 @@ export class BulkActionsComponent implements OnInit, OnDestroy {
label: this._appLocalization.get('applications.content.bulkActions.addRemoveTags'), items: [
{
label: this._appLocalization.get('applications.content.bulkActions.addTags'), command: (event) => {
this.openBulkActionWindow('addTags', 500, 500);
this.openBulkActionWindow('addTags', 586, 369);
}
},
{
label: this._appLocalization.get('applications.content.bulkActions.removeTags'), command: (event) => {
this.openBulkActionWindow('removeTags', 500, 500);
this.openBulkActionWindow('removeTags', 586, 369);
}
}]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="kContent kOverrideFAIcons">
<span class="kTitle">{{'applications.content.bulkActions.addTags' | translate}}</span>
<div class="kTags">
<span class="kLabel">{{'applications.content.bulkActions.addTagsLabel' | translate}}</span>
<div class="kLabel">{{'applications.content.bulkActions.addTagsLabel' | translate}}</div>
<kAutoComplete [(ngModel)]="tags"
suggestionItemField="item"
suggestionSelectableField="isSelectable"
Expand All @@ -14,7 +14,13 @@
</kAutoComplete>
</div>
<div class="kFooter">
<button type="button" class="kButtonBranded" pButton label="{{'applications.content.bulkActions.apply' | translate}}" (click)="_apply()"></button>
<button type="button" class="kButtonDefault" pButton
[label]="'applications.content.bulkActions.cancel' | translate"
(click)="parentPopupWidget?.close()"></button>
<button type="button" class="kButtonBranded" pButton
[disabled]="!tags.length"
[label]="'applications.content.bulkActions.addTagsBtn' | translate:[tags.length || '']"
(click)="_apply()"></button>
</div>
</div>
</k-area-blocker>
Loading