mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
[ACS-5645]Implemented the changes as per review comments
This commit is contained in:
committed by
Anukriti Singh
parent
ac9e8dd6db
commit
2c4e815161
+22
-10
@@ -32,6 +32,7 @@ import {
|
|||||||
CardViewBaseItemModel,
|
CardViewBaseItemModel,
|
||||||
CardViewItem,
|
CardViewItem,
|
||||||
LogService,
|
LogService,
|
||||||
|
NotificationService,
|
||||||
TranslationService,
|
TranslationService,
|
||||||
UpdateNotification
|
UpdateNotification
|
||||||
} from '@alfresco/adf-core';
|
} from '@alfresco/adf-core';
|
||||||
@@ -47,7 +48,6 @@ import { CategoriesManagementMode } from '../../../category/categories-managemen
|
|||||||
import { MatExpansionPanel } from '@angular/material/expansion';
|
import { MatExpansionPanel } from '@angular/material/expansion';
|
||||||
import { AllowableOperationsEnum, ContentService } from '../../../common';
|
import { AllowableOperationsEnum, ContentService } from '../../../common';
|
||||||
import { ButtonType } from './button-type.enum';
|
import { ButtonType } from './button-type.enum';
|
||||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
|
||||||
|
|
||||||
const DEFAULT_SEPARATOR = ', ';
|
const DEFAULT_SEPARATOR = ', ';
|
||||||
|
|
||||||
@@ -136,6 +136,22 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
|
|||||||
@Output()
|
@Output()
|
||||||
editableChange = new EventEmitter<boolean>();
|
editableChange = new EventEmitter<boolean>();
|
||||||
|
|
||||||
|
/** Emitted when content's editableTags state is changed. **/
|
||||||
|
@Output()
|
||||||
|
editableTagsChange = new EventEmitter<boolean>();
|
||||||
|
|
||||||
|
/** Emitted when content's editableCategories state is changed. **/
|
||||||
|
@Output()
|
||||||
|
editableCategoriesChange = new EventEmitter<boolean>();
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
editableCategories = false;
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
editableTags = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private _assignedTags: string[] = [];
|
private _assignedTags: string[] = [];
|
||||||
private assignedTagsEntries: TagEntry[] = [];
|
private assignedTagsEntries: TagEntry[] = [];
|
||||||
private _editable = false;
|
private _editable = false;
|
||||||
@@ -159,9 +175,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
|
|||||||
classifiableChanged = this.classifiableChangedSubject.asObservable();
|
classifiableChanged = this.classifiableChangedSubject.asObservable();
|
||||||
generalInfoPanelState: boolean;
|
generalInfoPanelState: boolean;
|
||||||
tagsPanelState: boolean;
|
tagsPanelState: boolean;
|
||||||
editableTags = false;
|
|
||||||
categoriesPanelState: boolean;
|
categoriesPanelState: boolean;
|
||||||
editableCategories = false;
|
|
||||||
hasAllowableOperations = false;
|
hasAllowableOperations = false;
|
||||||
editableGroup: CardViewGroup;
|
editableGroup: CardViewGroup;
|
||||||
buttonType = ButtonType;
|
buttonType = ButtonType;
|
||||||
@@ -178,7 +192,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
|
|||||||
private categoryService: CategoryService,
|
private categoryService: CategoryService,
|
||||||
private cdr: ChangeDetectorRef,
|
private cdr: ChangeDetectorRef,
|
||||||
private contentService: ContentService,
|
private contentService: ContentService,
|
||||||
private snackBar: MatSnackBar
|
private notificationService: NotificationService
|
||||||
) {
|
) {
|
||||||
this.copyToClipboardAction = this.appConfig.get<boolean>('content-metadata.copy-to-clipboard-action');
|
this.copyToClipboardAction = this.appConfig.get<boolean>('content-metadata.copy-to-clipboard-action');
|
||||||
this.multiValueSeparator = this.appConfig.get<string>('content-metadata.multi-value-pipe-separator') || DEFAULT_SEPARATOR;
|
this.multiValueSeparator = this.appConfig.get<string>('content-metadata.multi-value-pipe-separator') || DEFAULT_SEPARATOR;
|
||||||
@@ -355,11 +369,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showSnackbar(message: string): void {
|
showSnackbar(message: string): void {
|
||||||
this.snackBar.open(message, '', {
|
this.notificationService.showError(message)
|
||||||
duration: 3000,
|
|
||||||
verticalPosition: 'bottom',
|
|
||||||
panelClass: ['adf-snackbar-message']
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleEdit(event: MouseEvent, group: CardViewGroup, buttonType: ButtonType): void {
|
toggleEdit(event: MouseEvent, group: CardViewGroup, buttonType: ButtonType): void {
|
||||||
@@ -377,6 +387,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
|
|||||||
switch (buttonType) {
|
switch (buttonType) {
|
||||||
case ButtonType.GeneralInfo:
|
case ButtonType.GeneralInfo:
|
||||||
this.editable = !this.editable;
|
this.editable = !this.editable;
|
||||||
|
this.editableChange.emit(this.editable);
|
||||||
this.panel.open();
|
this.panel.open();
|
||||||
this.editableTags = false;
|
this.editableTags = false;
|
||||||
this.editableCategories = false;
|
this.editableCategories = false;
|
||||||
@@ -384,19 +395,20 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
|
|||||||
|
|
||||||
case ButtonType.Tags:
|
case ButtonType.Tags:
|
||||||
this.editableTags = !this.editableTags;
|
this.editableTags = !this.editableTags;
|
||||||
|
this.editableTagsChange.emit(this.editableTags);
|
||||||
this.tagsPanelState = this.editableTags;
|
this.tagsPanelState = this.editableTags;
|
||||||
this.tagNameControlVisible = true;
|
this.tagNameControlVisible = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ButtonType.Categories:
|
case ButtonType.Categories:
|
||||||
this.editableCategories = !this.editableCategories;
|
this.editableCategories = !this.editableCategories;
|
||||||
|
this.editableCategoriesChange.emit(this.editableCategories);
|
||||||
this.categoriesPanelState = this.editableCategories;
|
this.categoriesPanelState = this.editableCategories;
|
||||||
this.categoryControlVisible = true;
|
this.categoryControlVisible = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ButtonType.Group:
|
case ButtonType.Group:
|
||||||
group.editable = !group.editable;
|
group.editable = !group.editable;
|
||||||
this.editableChange.emit(this.editable);
|
|
||||||
this.editableGroup = group.editable ? group : null;
|
this.editableGroup = group.editable ? group : null;
|
||||||
if (group.editable) {
|
if (group.editable) {
|
||||||
group.expanded = true;
|
group.expanded = true;
|
||||||
|
|||||||
@@ -47,8 +47,6 @@
|
|||||||
--adf-user-info-container-margin-right: $adf-ref-margin-right,
|
--adf-user-info-container-margin-right: $adf-ref-margin-right,
|
||||||
--adf-metadata-property-panel-border-color: $adf-metadata-property-panel-border-color,
|
--adf-metadata-property-panel-border-color: $adf-metadata-property-panel-border-color,
|
||||||
--adf-metadata-buttons-background-color: $adf-metadata-buttons-background-color,
|
--adf-metadata-buttons-background-color: $adf-metadata-buttons-background-color,
|
||||||
--adf-snackbar-message-background-color: $adf-snackbar-message-background-color,
|
|
||||||
--adf-snackbar-message-color: $adf-snackbar-message-color
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// propagates SCSS variables into the CSS variables scope
|
// propagates SCSS variables into the CSS variables scope
|
||||||
|
|||||||
@@ -29,5 +29,3 @@ $adf-ref-line-height: 40px;
|
|||||||
$adf-ref-margin-right: 8px;
|
$adf-ref-margin-right: 8px;
|
||||||
$adf-metadata-property-panel-border-color: rgba(0, 0, 0, 0.12);
|
$adf-metadata-property-panel-border-color: rgba(0, 0, 0, 0.12);
|
||||||
$adf-metadata-buttons-background-color: rgba(33, 33, 33, 0.05);
|
$adf-metadata-buttons-background-color: rgba(33, 33, 33, 0.05);
|
||||||
$adf-snackbar-message-background-color: #ba1b1b;
|
|
||||||
$adf-snackbar-message-color: #f8f8f8
|
|
||||||
|
|||||||
Reference in New Issue
Block a user