Browse Source

Max contributors fixed.

pull/362/head
Sebastian Stehle 7 years ago
parent
commit
3edcef40b3
  1. 2
      src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs
  2. 2
      src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/ConfigAppPlansProvider.cs
  3. 2
      src/Squidex/app/features/settings/pages/plans/plans-page.component.html
  4. 2
      src/Squidex/app/framework/angular/panel.component.html
  5. 3
      src/Squidex/app/framework/angular/panel.component.ts
  6. 4
      src/Squidex/app/theme/_panels.scss
  7. 2
      tests/Squidex.Domain.Apps.Entities.Tests/Apps/Billing/ConfigAppLimitsProviderTests.cs
  8. 3
      tests/Squidex.Domain.Apps.Entities.Tests/Apps/Guards/GuardAppContributorsTests.cs

2
src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs

@ -58,7 +58,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards
e(Not.New("Contributor", "role"), nameof(command.Role)); e(Not.New("Contributor", "role"), nameof(command.Role));
} }
} }
else if (contributors.Count >= plan.MaxContributors) else if (plan.MaxContributors > 0 && contributors.Count >= plan.MaxContributors)
{ {
e("You have reached the maximum number of contributors for your plan."); e("You have reached the maximum number of contributors for your plan.");
} }

2
src/Squidex.Domain.Apps.Entities/Apps/Services/Implementations/ConfigAppPlansProvider.cs

@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Services.Implementations
Name = "Infinite", Name = "Infinite",
MaxApiCalls = -1, MaxApiCalls = -1,
MaxAssetSize = -1, MaxAssetSize = -1,
MaxContributors = int.MaxValue MaxContributors = -1
}; };
private readonly Dictionary<string, ConfigAppLimitsPlan> plansById = new Dictionary<string, ConfigAppLimitsPlan>(StringComparer.OrdinalIgnoreCase); private readonly Dictionary<string, ConfigAppLimitsPlan> plansById = new Dictionary<string, ConfigAppLimitsPlan>(StringComparer.OrdinalIgnoreCase);

2
src/Squidex/app/features/settings/pages/plans/plans-page.component.html

@ -1,6 +1,6 @@
<sqx-title message="{app} | Plans | Settings" parameter1="app" [value1]="appsState.appName"></sqx-title> <sqx-title message="{app} | Plans | Settings" parameter1="app" [value1]="appsState.appName"></sqx-title>
<sqx-panel desiredWidth="64rem" [showSidebar]="true"> <sqx-panel desiredWidth="64rem" [showSidebar]="true" [scrollX]="true">
<ng-container title> <ng-container title>
Update Plan Update Plan
</ng-container> </ng-container>

2
src/Squidex/app/framework/angular/panel.component.html

@ -26,7 +26,7 @@
</div> </div>
<div class="panel-main"> <div class="panel-main">
<div class="panel-content {{contentClass}}" [class.panel-content-scroll]="showScrollbar" [class.panel-content-blank]="isBlank"> <div class="panel-content {{contentClass}}" [class.panel-content-scroll-x]="scrollX" [class.panel-content-scroll]="showScrollbar" [class.panel-content-blank]="isBlank">
<ng-content select="[content]"></ng-content> <ng-content select="[content]"></ng-content>
</div> </div>

3
src/Squidex/app/framework/angular/panel.component.ts

@ -43,6 +43,9 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit {
@Input() @Input()
public isLazyLoaded = true; public isLazyLoaded = true;
@Input()
public scrollX = false;
@Input() @Input()
public showScrollbar = false; public showScrollbar = false;

4
src/Squidex/app/theme/_panels.scss

@ -101,6 +101,10 @@
overflow-y: scroll; overflow-y: scroll;
} }
&-scroll-x {
overflow-y: auto;
}
& .nav-panel { & .nav-panel {
& { & {
margin-left: -$panel-padding; margin-left: -$panel-padding;

2
tests/Squidex.Domain.Apps.Entities.Tests/Apps/Billing/ConfigAppLimitsProviderTests.cs

@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Billing
Name = "Infinite", Name = "Infinite",
MaxApiCalls = -1, MaxApiCalls = -1,
MaxAssetSize = -1, MaxAssetSize = -1,
MaxContributors = int.MaxValue MaxContributors = -1
}; };
private static readonly ConfigAppLimitsPlan FreePlan = new ConfigAppLimitsPlan private static readonly ConfigAppLimitsPlan FreePlan = new ConfigAppLimitsPlan

3
tests/Squidex.Domain.Apps.Entities.Tests/Apps/Guards/GuardAppContributorsTests.cs

@ -133,6 +133,9 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards
[Fact] [Fact]
public async Task CanAssign_should_not_throw_exception_if_user_found() public async Task CanAssign_should_not_throw_exception_if_user_found()
{ {
A.CallTo(() => appPlan.MaxContributors)
.Returns(-1);
var command = new AssignContributor { ContributorId = "1" }; var command = new AssignContributor { ContributorId = "1" };
await GuardAppContributors.CanAssign(contributors_0, roles, command, users, appPlan); await GuardAppContributors.CanAssign(contributors_0, roles, command, users, appPlan);

Loading…
Cancel
Save