Skip to content
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
71 changes: 71 additions & 0 deletions src/app/core/services/edit/edit.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,77 @@ describe('EditService', () => {
expect(apiService.folder.getStelaFolderVOs).not.toHaveBeenCalled();
});

it('should revert property and show error when updateStelaRecord fails', async () => {
const messageService = TestBed.inject(MessageService);
spyOn(messageService, 'showError');

const record = new RecordVO({ recordId: 1, displayTime: 'original-value' });
const httpError = {
error: { message: 'Invalid date format' },
message: 'Http failure',
};

(apiService.record.updateStelaRecord as jasmine.Spy).and.returnValue(
Promise.reject(httpError),
);
(apiService.record.update as jasmine.Spy).and.returnValue(
Promise.resolve([]),
);

await service.saveItemVoProperty(record, 'displayTime', 'new-value');

expect(record.displayTime).toBe('original-value');
expect(messageService.showError).toHaveBeenCalledWith({
message: 'Invalid date format',
});
});

it('should show fallback error when updateStelaRecord fails without error body', async () => {
const messageService = TestBed.inject(MessageService);
spyOn(messageService, 'showError');

const record = new RecordVO({ recordId: 1, displayTime: 'original-value' });

(apiService.record.updateStelaRecord as jasmine.Spy).and.returnValue(
Promise.reject({}),
);
(apiService.record.update as jasmine.Spy).and.returnValue(
Promise.resolve([]),
);

await service.saveItemVoProperty(record, 'displayTime', 'new-value');

expect(record.displayTime).toBe('original-value');
expect(messageService.showError).toHaveBeenCalledWith({
message: 'Failed to save changes',
});
});

it('should revert property and show error when updateStelaFolder fails', async () => {
const messageService = TestBed.inject(MessageService);
spyOn(messageService, 'showError');

const folder = new FolderVO({ folderId: 1, displayTime: 'original-value' });
const httpError = { error: { error: 'Invalid EDTF string' } };

(apiService.folder.updateStelaFolder as jasmine.Spy).and.returnValue(
Promise.reject(httpError),
);
(apiService.folder.update as jasmine.Spy).and.returnValue(
Promise.resolve({}),
);
(apiService.folder.getStelaFolderVOs as jasmine.Spy).and.returnValue(
Promise.resolve({ getFolderVOs: () => [] }),
);

await service.saveItemVoProperty(folder, 'displayTime', 'new-value');

expect(folder.displayTime).toBe('original-value');
expect(messageService.showError).toHaveBeenCalledWith({
message: 'Invalid EDTF string',
});
});

describe('openShareDialog', () => {
const mockShareLink: ShareLink = {
id: 'link1',
Expand Down
19 changes: 16 additions & 3 deletions src/app/core/services/edit/edit.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,23 @@ export class EditService {
item.update(newData);
await this.updateItems([item], [property]);
} catch (err) {
const revertData: Partial<ItemVO> = {};
revertData[property] = originalValue;
item.update(revertData);

if (err instanceof FolderResponse || err instanceof RecordResponse) {
const revertData: Partial<ItemVO> = {};
revertData[property] = originalValue;
item.update(revertData);
this.message.showError({
message: err.getMessage(),
translate: true,
});
} else {
this.message.showError({
message:
err?.error?.message ||
err?.error?.error ||
err?.message ||
'Failed to save changes',
});
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<div class="pr-sidebar-date-picker" #sidebarDatePickerContainer>
<div class="pr-sidebar-date-picker-header">
<span class="pr-sidebar-date-picker-label">Date</span>
@if (activeQualifiers().length) {
<i class="material-icons pr-header-dot">fiber_manual_record</i>
<span class="pr-sidebar-date-picker-qualifiers">
{{ activeQualifiers().join(', ') }}:
</span>
}
</div>

<div
class="pr-sidebar-date-picker-rows"
[class.can-edit]="!disabled"
(click)="toggle()"
>
<div class="pr-sidebar-date-picker-row">
@if (hasEndDate()) {
<span class="pr-sidebar-date-picker-row-label">From</span>
}
@if (hasStartDate()) {
<span class="pr-sidebar-date-picker-row-value">
<span class="pr-date-part"
>{{ formattedStartDate() }}
@if (formattedStartTime()) {
<i class="material-icons pr-dot">fiber_manual_record</i>
}
</span>
@if (formattedStartTime()) {
<span class="pr-time-group">
<span class="pr-time-part">{{ formattedStartTime() }}</span>
<span class="pr-muted">{{ startMeridian() }}</span>
@if (startTimezone()) {
<span class="pr-muted">{{ startTimezone() }}</span>
}
</span>
}
</span>
} @else {
<span class="pr-sidebar-date-picker-row-placeholder">
{{ disabled ? 'No date' : 'Click to add date' }}
</span>
}
@if (!disabled) {
<span class="pr-sidebar-date-picker-edit-icon">
<i class="material-icons">edit</i>
</span>
}
</div>

@if (hasEndDate()) {
<div class="pr-sidebar-date-picker-row pr-sidebar-date-picker-to-row">
<span class="pr-sidebar-date-picker-row-label">To</span>
<span class="pr-sidebar-date-picker-row-value">
<span class="pr-date-part"
>{{ formattedEndDate() }}
@if (formattedEndTime()) {
<i class="material-icons pr-dot">fiber_manual_record</i>
}
</span>
@if (formattedEndTime()) {
<span class="pr-time-group">
<span class="pr-time-part">{{ formattedEndTime() }}</span>
<span class="pr-muted">{{ endMeridian() }}</span>
@if (endTimezone()) {
<span class="pr-muted">{{ endTimezone() }}</span>
}
</span>
}
</span>
</div>
}
</div>

@if (isDropdownOpen()) {
<div class="pr-sidebar-date-picker-panel">
<div class="pr-sidebar-date-picker-fields">
<pr-datepicker-input
[date]="_date()"
(dateChange)="onDateChange($event)"
/>

<pr-timepicker-input
[time]="_time()"
(timeChange)="onTimeChange($event)"
/>

<button class="pr-clear-btn" (click)="clearAll()">
Comment thread
aasandei-vsp marked this conversation as resolved.
<i class="material-icons">backspace</i>
<span>Clear date and time</span>
</button>
</div>

<div class="pr-sidebar-date-picker-footer">
<button class="pr-more-options-btn" (click)="onMoreOptions()">
Comment thread
aasandei-vsp marked this conversation as resolved.
<i class="material-icons">tune</i>
<span>More options</span>
</button>

<div class="pr-sidebar-date-picker-actions">
<button class="pr-btn-cancel" (click)="onCancel()">Cancel</button>
<button class="pr-btn-save" (click)="onSave()">
Comment thread
aasandei-vsp marked this conversation as resolved.
<i class="material-icons">keyboard_return</i>
</button>
</div>
</div>
</div>
}
</div>
Loading