Browse Source

Minor bugfixes.

pull/310/head
Sebastian 8 years ago
parent
commit
5455f53ffa
  1. 4
      src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs
  2. 2
      src/Squidex.Domain.Apps.Events/Apps/AppPatternDeleted.cs
  3. 4
      src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html
  4. 6
      src/Squidex/app/framework/angular/http/http-extensions.ts
  5. 13
      src/Squidex/app/shared/state/contributors.state.ts
  6. 1
      src/Squidex/package.json

4
src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs

@ -53,7 +53,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
"added pattern {[Name]}"); "added pattern {[Name]}");
AddEventMessage<AppPatternDeleted>( AddEventMessage<AppPatternDeleted>(
"deleted pattern {[Name]}"); "deleted pattern {[PatternId]}");
AddEventMessage<AppPatternUpdated>( AddEventMessage<AppPatternUpdated>(
"updated pattern {[Name]}"); "updated pattern {[Name]}");
@ -164,7 +164,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
return Task.FromResult( return Task.FromResult(
ForEvent(@event, channel) ForEvent(@event, channel)
.AddParameter("Name", @event.Name)); .AddParameter("PatternId", @event.PatternId));
} }
protected override Task<HistoryEventToStore> CreateEventCoreAsync(Envelope<IEvent> @event) protected override Task<HistoryEventToStore> CreateEventCoreAsync(Envelope<IEvent> @event)

2
src/Squidex.Domain.Apps.Events/Apps/AppPatternDeleted.cs

@ -14,7 +14,5 @@ namespace Squidex.Domain.Apps.Events.Apps
public sealed class AppPatternDeleted : AppEvent public sealed class AppPatternDeleted : AppEvent
{ {
public Guid PatternId { get; set; } public Guid PatternId { get; set; }
public string Name { get; set; }
} }
} }

4
src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html

@ -60,11 +60,11 @@
</sqx-panel> </sqx-panel>
<sqx-modal-dialog *sqxModalView="eventConsumerErrorDialog;onRoot:true" (closed)="eventConsumerErrorDialog.hide()"> <sqx-modal-dialog *sqxModalView="eventConsumerErrorDialog;onRoot:true" (closed)="eventConsumerErrorDialog.hide()">
<ng-container #title> <ng-container title>
Error Error
</ng-container> </ng-container>
<ng-container #content> <ng-container content>
<textarea readonly class="form-control error-message">{{eventConsumerError}}</textarea> <textarea readonly class="form-control error-message">{{eventConsumerError}}</textarea>
</ng-container> </ng-container>
</sqx-modal-dialog> </sqx-modal-dialog>

6
src/Squidex/app/framework/angular/http/http-extensions.ts

@ -67,7 +67,11 @@ export const pretifyError = (message: string) => <T>(source: Observable<T>) =>
if (!Types.is(response.error, Error)) { if (!Types.is(response.error, Error)) {
try { try {
const errorDto = Types.isObject(response.error) ? response.error : JSON.parse(response.error); let errorDto = Types.isObject(response.error) ? response.error : JSON.parse(response.error);
if (!errorDto) {
errorDto = { message: 'Failed to make the request.', details: [] };
}
if (response.status === 412) { if (response.status === 412) {
result = new ErrorDto(response.status, 'Failed to make the update. Another user has made a change. Please reload.'); result = new ErrorDto(response.status, 'Failed to make the update. Another user has made a change. Please reload.');

13
src/Squidex/app/shared/state/contributors.state.ts

@ -6,14 +6,16 @@
*/ */
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable, throwError } from 'rxjs';
import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
import { import {
DialogService, DialogService,
ErrorDto,
ImmutableArray, ImmutableArray,
notify, notify,
State, State,
Types,
Version Version
} from '@app/framework'; } from '@app/framework';
@ -100,6 +102,13 @@ export class ContributorsState extends State<Snapshot> {
this.replaceContributors(contributors, dto.version); this.replaceContributors(contributors, dto.version);
}), }),
catchError(error => {
if (Types.is(error, ErrorDto) && error.statusCode === 404) {
return throwError(new ErrorDto(404, 'The user does not exist.'));
} else {
return throwError(error);
}
}),
notify(this.dialogs)); notify(this.dialogs));
} }

1
src/Squidex/package.json

@ -34,6 +34,7 @@
"moment": "2.22.2", "moment": "2.22.2",
"mousetrap": "1.6.2", "mousetrap": "1.6.2",
"ng2-dnd": "5.0.2", "ng2-dnd": "5.0.2",
"npm": "^6.2.0",
"oidc-client": "1.4.1", "oidc-client": "1.4.1",
"pikaday": "1.7.0", "pikaday": "1.7.0",
"progressbar.js": "1.0.1", "progressbar.js": "1.0.1",

Loading…
Cancel
Save