import changes and indentation correction

This commit is contained in:
Jatin_Chugh
2023-06-07 10:45:59 +05:30
parent 64f517d4b7
commit 524cb5686b
2 changed files with 29 additions and 20 deletions
@@ -1,8 +1,11 @@
<div class="adf-share-link__dialog-content"> <div class="adf-share-link__dialog-content">
<div class="adf-share-link__dialog-container"> <div class="adf-share-link__dialog-container">
<div class="adf-share-link--row"> <div class="adf-share-link--row">
<div data-automation-id="adf-share-dialog-title" class="adf-share-link__title adf-share-link__label adf-share-link__heading" <div
role="heading" aria-level="1"> data-automation-id="adf-share-dialog-title"
class="adf-share-link__title adf-share-link__label adf-share-link__heading"
role="heading"
aria-level="1">
{{ 'SHARE.DIALOG-TITLE' | translate }} {{ fileName }} {{ 'SHARE.DIALOG-TITLE' | translate }} {{ fileName }}
</div> </div>
<mat-icon mat-dialog-close class="adf-share-link__close adf-share-link__icon">close</mat-icon> <mat-icon mat-dialog-close class="adf-share-link__close adf-share-link__icon">close</mat-icon>
@@ -12,7 +15,8 @@
<form [formGroup]="form" class="adf-share-link__form"> <form [formGroup]="form" class="adf-share-link__form">
<div class="adf-share-link--row"> <div class="adf-share-link--row">
<mat-icon class="adf-share-link__icon">timer</mat-icon> <mat-icon class="adf-share-link__icon">timer</mat-icon>
<div class="adf-share-link__label adf-sharable-link">{{ 'SHARE.LINK-EXPIRY-DATE' | translate }}</div> <div class="adf-share-link__label adf-sharable-link">{{ 'SHARE.LINK-EXPIRY-DATE' | translate }}
</div>
<mat-slide-toggle <mat-slide-toggle
#slideToggleExpirationDate #slideToggleExpirationDate
[disabled]="!canUpdate" [disabled]="!canUpdate"
@@ -23,7 +27,9 @@
(change)="onToggleExpirationDate($event)"> (change)="onToggleExpirationDate($event)">
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<div *ngIf="isExpiryDateToggleChecked" data-automation-id="adf-slide-toggle-checked" <div
*ngIf="isExpiryDateToggleChecked"
data-automation-id="adf-slide-toggle-checked"
class="adf-share-link__date-time-container"> class="adf-share-link__date-time-container">
<mat-form-field class="adf-full-width adf-float-label" floatLabel='always'> <mat-form-field class="adf-full-width adf-float-label" floatLabel='always'>
<mat-label>{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}</mat-label> <mat-label>{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}</mat-label>
@@ -39,7 +45,8 @@
[type]="type" [type]="type"
[timeInterval]="1"> [timeInterval]="1">
</mat-datetimepicker> </mat-datetimepicker>
<input class="adf-share-link__input" <input
class="adf-share-link__input"
#dateTimePickerInput #dateTimePickerInput
matInput matInput
placeholder="{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}" placeholder="{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}"
@@ -59,7 +66,8 @@
[disabled]="!canUpdate || isDisabled" [disabled]="!canUpdate || isDisabled"
(change)="onSlideShareChange($event)"> (change)="onSlideShareChange($event)">
</mat-slide-toggle> </mat-slide-toggle>
<div class="adf-share-link__label adf-sharable-link">{{ 'SHARE.SHARABLE-LINK-CREATED' | translate }}</div> <div class="adf-share-link__label adf-sharable-link">{{ 'SHARE.SHARABLE-LINK-CREATED' | translate }}
</div>
</div> </div>
<mat-form-field class="adf-full-width adf-float-label" floatLabel='always'> <mat-form-field class="adf-full-width adf-float-label" floatLabel='always'>
<input <input
@@ -76,7 +84,8 @@
class="adf-input-action adf-share-link__icon" class="adf-input-action adf-share-link__icon"
role="button" role="button"
matSuffix matSuffix
[clipboard-notification]="'SHARE.CLIPBOARD-MESSAGE' | translate" [adf-clipboard] [clipboard-notification]="'SHARE.CLIPBOARD-MESSAGE' | translate"
[adf-clipboard]
[attr.aria-label]="'SHARE.COPY_BUTTON_LABEL' | translate" [attr.aria-label]="'SHARE.COPY_BUTTON_LABEL' | translate"
[target]="sharedLinkInput" [target]="sharedLinkInput"
tabindex="0"> tabindex="0">
@@ -88,7 +97,8 @@
</p> </p>
<div class="adf-share-link--row"> <div class="adf-share-link--row">
<mat-icon class="adf-share-link__icon">public</mat-icon> <mat-icon class="adf-share-link__icon">public</mat-icon>
<p class="adf-share-link__info adf-sharable-link adf-share-link__public-content adf-share-link__para"> <p
class="adf-share-link__info adf-sharable-link adf-share-link__public-content adf-share-link__para">
{{ 'SHARE.PUBLIC-CONTENT' | translate }} {{ 'SHARE.PUBLIC-CONTENT' | translate }}
</p> </p>
</div> </div>
@@ -30,8 +30,7 @@ import { SharedLinksApiService } from './services/shared-links-api.service';
import { ShareDialogComponent } from './content-node-share.dialog'; import { ShareDialogComponent } from './content-node-share.dialog';
import { ContentTestingModule } from '../testing/content.testing.module'; import { ContentTestingModule } from '../testing/content.testing.module';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { format } from 'date-fns'; import { format, endOfDay } from 'date-fns';
import endOfDay from 'date-fns/endOfDay';
describe('ShareDialogComponent', () => { describe('ShareDialogComponent', () => {
let node; let node;
@@ -270,7 +269,7 @@ describe('ShareDialogComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalled(); expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalled();
expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith('nodeId'); expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith('nodeId', undefined);
}); });
it('should not allow expiration date action when node has no update permission', async () => { it('should not allow expiration date action when node has no update permission', async () => {
@@ -320,7 +319,7 @@ describe('ShareDialogComponent', () => {
const expiryDate = format(endOfDay(date as Date), `yyyy-MM-dd'T'HH:mm:ss.SSSxx`); const expiryDate = format(endOfDay(date as Date), `yyyy-MM-dd'T'HH:mm:ss.SSSxx`);
expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalled(); expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalled();
expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith({ expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith('nodeId', {
nodeId: 'nodeId', nodeId: 'nodeId',
expiresAt: expiryDate expiresAt: expiryDate
}); });
@@ -342,7 +341,7 @@ describe('ShareDialogComponent', () => {
const expiryDate = format((new Date(date)), `yyyy-MM-dd'T'HH:mm:ss.SSSxx`); const expiryDate = format((new Date(date)), `yyyy-MM-dd'T'HH:mm:ss.SSSxx`);
expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalled(); expect(sharedLinksApiService.deleteSharedLink).toHaveBeenCalled();
expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith({ expect(sharedLinksApiService.createSharedLinks).toHaveBeenCalledWith('nodeId', {
nodeId: 'nodeId', nodeId: 'nodeId',
expiresAt: expiryDate expiresAt: expiryDate
}); });