Some style fixes.

extensions/Squidex.Extensions/Actions/ClientPool.cs

@@ -16,7 +16,7 @@ namespace Squidex.Extensions.Actions
 {
     internal sealed class ClientPool<TKey, TClient>
     {
-        private static readonly TimeSpan TTL = TimeSpan.FromMinutes(30);
+        private static readonly TimeSpan TimeToLive = TimeSpan.FromMinutes(30);
         private readonly MemoryCache memoryCache = new MemoryCache(Options.Create(new MemoryCacheOptions()));
         private readonly Func<TKey, Task<TClient>> factory;
 
@@ -41,7 +41,7 @@ namespace Squidex.Extensions.Actions
             {
                 client = await factory(key);
 
-                memoryCache.Set(key, client, TTL);
+                memoryCache.Set(key, client, TimeToLive);
             }
 
             return client;

extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs

@@ -53,8 +53,6 @@ namespace Squidex.Extensions.Actions.Email
                     message.Subject = job.MessageSubject;
                     message.Body = job.MessageBody;
 
-                    var sendTask = client.SendMailAsync(message);
-
                     using (ct.Register(client.SendAsyncCancel))
                     {
                         await client.SendMailAsync(message);

src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs

@@ -33,7 +33,7 @@ namespace Squidex.Domain.Apps.Core.ExtractReferenceIds
 
             if (value is JsonArray array)
             {
-                foreach (JsonObject item in array)
+                foreach (var item in array.OfType<JsonObject>())
                 {
                     foreach (var nestedField in field.Fields)
                     {

src/Squidex.Domain.Apps.Entities/AppProvider.cs

@@ -94,7 +94,7 @@ namespace Squidex.Domain.Apps.Entities
         {
             return localCache.GetOrCreateAsync($"GetSchemaAsync({appId}, {name})", async () =>
             {
-                using (Profiler.TraceMethod<AppProvider>("GetSchemaAsyncByName"))
+                using (Profiler.TraceMethod<AppProvider>())
                 {
                     var schemaId = await GetSchemaIdAsync(appId, name);
 
@@ -112,7 +112,7 @@ namespace Squidex.Domain.Apps.Entities
         {
             return localCache.GetOrCreateAsync($"GetSchemaAsync({appId}, {id}, {allowDeleted})", async () =>
             {
-                using (Profiler.TraceMethod<AppProvider>("GetSchemaAsyncById"))
+                using (Profiler.TraceMethod<AppProvider>())
                 {
                     var schema = await grainFactory.GetGrain<ISchemaGrain>(id).GetStateAsync();
 

src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs

@@ -268,7 +268,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
 
         public void AssignContributor(AssignContributor command, bool isNew)
         {
-            RaiseEvent(SimpleMapper.Map(command, new AppContributorAssigned { IsNew = isNew }));
+            RaiseEvent(SimpleMapper.Map(command, new AppContributorAssigned { IsAdded = isNew }));
         }
 
         public void RemoveContributor(RemoveContributor command)

src/Squidex.Domain.Apps.Entities/Apps/Invitation/InvitationEmailEventConsumer.cs

@@ -78,7 +78,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Invitation
 
             if (@event.Payload is AppContributorAssigned appContributorAssigned)
             {
-                if (!appContributorAssigned.Actor.IsSubject || !appContributorAssigned.IsNew)
+                if (!appContributorAssigned.Actor.IsSubject || !appContributorAssigned.IsAdded)
                 {
                     return;
                 }

src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs

@@ -63,7 +63,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
                         await assetStore.UploadAsync(context.ContextId.ToString(), createAsset.File.OpenRead());
                         try
                         {
-                            var result = await ExecuteCommandAsync(createAsset) as AssetSavedResult;
+                            var result = (AssetSavedResult)await ExecuteCommandAsync(createAsset);
 
                             context.Complete(new AssetCreatedResult(createAsset.AssetId, originalTags, result.Version));
 

src/Squidex.Domain.Apps.Entities/Rules/UsageTracking/UsageTrackerGrain.cs

@@ -79,7 +79,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.UsageTracking
             {
                 var target = kvp.Value;
 
-                var (from, _) = GetDateRange(today, target.NumDays);
+                var from = GetFromDate(today, target.NumDays);
 
                 if (!target.Triggered.HasValue || target.Triggered < from)
                 {
@@ -107,15 +107,15 @@ namespace Squidex.Domain.Apps.Entities.Rules.UsageTracking
             await WriteStateAsync();
         }
 
-        private static (DateTime, DateTime) GetDateRange(DateTime today, int? numDays)
+        private static DateTime GetFromDate(DateTime today, int? numDays)
         {
             if (numDays.HasValue)
             {
-                return (today.AddDays(-numDays.Value).AddDays(1), today);
+                return today.AddDays(-numDays.Value).AddDays(1);
             }
             else
             {
-                return (new DateTime(today.Year, today.Month, 1), today);
+                return new DateTime(today.Year, today.Month, 1);
             }
         }
 

src/Squidex.Domain.Apps.Events/Apps/AppContributorAssigned.cs

@@ -18,6 +18,6 @@ namespace Squidex.Domain.Apps.Events.Apps
 
         public bool IsCreated { get; set; }
 
-        public bool IsNew { get; set; }
+        public bool IsAdded { get; set; }
     }
 }

src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs

@@ -69,28 +69,28 @@ namespace Microsoft.Extensions.DependencyInjection
         {
             services.AddTransient(typeof(T), factory);
 
-            return new InterfaceRegistrator<T>((t, f) => services.AddTransient(t, f), (t, f) => services.TryAddTransient(t, f));
+            return new InterfaceRegistrator<T>((t, f) => services.AddTransient(t, f), services.TryAddTransient);
         }
 
         public static InterfaceRegistrator<T> AddTransientAs<T>(this IServiceCollection services) where T : class
         {
             services.AddTransient<T, T>();
 
-            return new InterfaceRegistrator<T>((t, f) => services.AddTransient(t, f), (t, f) => services.TryAddTransient(t, f));
+            return new InterfaceRegistrator<T>((t, f) => services.AddTransient(t, f), services.TryAddTransient);
         }
 
         public static InterfaceRegistrator<T> AddSingletonAs<T>(this IServiceCollection services, Func<IServiceProvider, T> factory) where T : class
         {
             services.AddSingleton(typeof(T), factory);
 
-            return new InterfaceRegistrator<T>((t, f) => services.AddSingleton(t, f), (t, f) => services.TryAddSingleton(t, f));
+            return new InterfaceRegistrator<T>((t, f) => services.AddSingleton(t, f), services.TryAddSingleton);
         }
 
         public static InterfaceRegistrator<T> AddSingletonAs<T>(this IServiceCollection services) where T : class
         {
             services.AddSingleton<T, T>();
 
-            return new InterfaceRegistrator<T>((t, f) => services.AddSingleton(t, f), (t, f) => services.TryAddSingleton(t, f));
+            return new InterfaceRegistrator<T>((t, f) => services.AddSingleton(t, f), services.TryAddSingleton);
         }
     }
 }

src/Squidex.Infrastructure/Security/Permission.cs

@@ -100,9 +100,9 @@ namespace Squidex.Infrastructure.Security
             return true;
         }
 
-        public bool StartsWith(string id)
+        public bool StartsWith(string test)
         {
-            return id.StartsWith(id, StringComparison.OrdinalIgnoreCase);
+            return id.StartsWith(test, StringComparison.OrdinalIgnoreCase);
         }
 
         public override bool Equals(object obj)

src/Squidex/Pipeline/Plugins/MvcParts.cs

@@ -25,7 +25,7 @@ namespace Squidex.Pipeline.Plugins
 
                 foreach (var reference in RelatedAssemblyAttribute.GetRelatedAssemblies(assembly, false))
                 {
-                    AddParts(parts, assembly);
+                    AddParts(parts, reference);
                 }
             });
         }

src/Squidex/app-config/karma.conf.js

@@ -17,7 +17,7 @@ module.exports = function (config) {
         ],
 
         preprocessors: {
-            './app-config/karma-test-shim.js': ['webpack', 'sourcemap'],
+            './app-config/karma-test-shim.js': ['webpack', 'sourcemap']
         },
 
         /**

src/Squidex/app-config/karma.coverage.conf.js

@@ -17,7 +17,7 @@ module.exports = function (config) {
         ],
 
         preprocessors: {
-            './app-config/karma-test-shim.js': ['webpack', 'sourcemap'],
+            './app-config/karma-test-shim.js': ['webpack', 'sourcemap']
         },
 
         /**

src/Squidex/app-config/webpack.config.js

@@ -49,8 +49,7 @@ module.exports = {
         rules: [{
             test: /\.mjs$/,
             type: "javascript/auto",
-            include: [/node_modules/],
-            
+            include: [/node_modules/]
           }, {
             test: /[\/\\]@angular[\/\\]core[\/\\].+\.js$/,
             parser: { system: true },

src/Squidex/app/features/rules/pages/rules/triggers/usage-trigger.component.html

@@ -1,6 +1,6 @@
 <div [formGroup]="triggerForm" class="form-horizontal">
     <div class="form-group">
-        <label for="condition">Limit</label>
+        <label for="limit">Limit</label>
 
         <sqx-control-errors for="limit" [submitted]="triggerFormSubmitted"></sqx-control-errors>
 
@@ -16,7 +16,7 @@
 
         <sqx-control-errors for="numDays" fieldName="Days" [submitted]="triggerFormSubmitted"></sqx-control-errors>
 
-        <input type="number" step="1" class="form-control" id="numDays" formControlName="numDays" />
+        <input type="number" step="1" class="form-control" id="condition" formControlName="numDays" />
         
         <small class="form-text text-muted">
             The number of days to check or empty to check the current month.

src/Squidex/app/features/schemas/pages/schema/types/assets-ui.component.html

@@ -1,3 +1,3 @@
 <div [formGroup]="editForm">
     <span>Nothing to setup</span>    
-<div>
+</div>

src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.html

@@ -39,7 +39,7 @@
         </div>
 
         <div class="form-group row" *ngIf="showDefaultValue | async">
-            <label class="col-3 col-form-label" for="{{field.fieldId}}_fieldDefaultValue">Default Value</label>
+            <label class="col-3 col-form-label">Default Value</label>
 
             <div class="col-9">
                 <sqx-date-time-editor enforceTime="true" mode="DateTime" formControlName="defaultValue"></sqx-date-time-editor>

src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.html

@@ -23,4 +23,4 @@
             </label>
         </div>
     </div>
-<div>
+</div>

src/Squidex/app/features/schemas/pages/schema/types/json-ui.component.html

@@ -10,4 +10,4 @@
             </small>
         </div>
     </div>
-<div>
+</div>

src/Squidex/app/features/schemas/pages/schema/types/references-ui.component.html

@@ -1,3 +1,3 @@
 <div [formGroup]="editForm">
     <span>Nothing to setup</span>    
-<div>
+</div>

src/Squidex/app/framework/angular/forms/control-errors.component.ts

@@ -77,7 +77,7 @@ export class ControlErrorsComponent extends StatefulComponent<State> implements
             }
         }
 
-        let control: AbstractControl | null = null;
+        let control: AbstractControl | null;
 
         if (Types.isString(this.for)) {
             control = this.formGroupDirective.form.controls[this.for];

src/Squidex/app/framework/angular/forms/date-time-editor.component.ts

@@ -159,7 +159,7 @@ export class DateTimeEditorComponent extends StatefulControlComponent<{}, string
     }
 
     private updateValue() {
-        let result: string | null = null;
+        let result: string | null;
 
         if ((this.dateValue && !this.dateValue.isValid()) || (this.timeValue && !this.timeValue.isValid())) {
             result = null;

src/Squidex/app/framework/angular/forms/tag-editor.component.ts

@@ -312,6 +312,8 @@ export class TagEditorComponent extends StatefulControlComponent<State, any[]> i
             this.resetAutocompletion();
             return true;
         }
+
+        return false;
     }
 
     private resetAutocompletion() {

src/Squidex/app/framework/angular/forms/validators.ts

@@ -24,7 +24,7 @@ export module ValidatorsEx {
         return (control: AbstractControl) => {
             const error = inner(control);
 
-            if (error !== null && error.pattern && message) {
+            if (!!error && error.pattern && message) {
                 return { patternmessage: { requiredPattern: error.pattern.requiredPattern, actualValue: error.pattern.actualValue, message } };
             }
 

src/Squidex/app/framework/angular/modals/tooltip.directive.ts

@@ -52,7 +52,7 @@ export class TooltipDirective {
     private unsetAttribute() {
         try {
             this.renderer.setAttribute(this.element.nativeElement, 'title', '');
-        } catch {
+        } catch (ex) {
             return;
         }
     }

src/Squidex/app/framework/utils/permission.ts

@@ -96,16 +96,20 @@ export class Permission {
 
     private static intersects(lhs: { [key: string]: true }, rhs: { [key: string]: true }) {
         for (let key in lhs) {
+            if (lhs.hasOwnProperty(key)) {
                 if (rhs[key]) {
                     return true;
                 }
             }
+        }
 
         for (let key in rhs) {
+            if (rhs.hasOwnProperty(key)) {
                 if (lhs[key]) {
                     return true;
                 }
             }
+        }
 
         return false;
     }

src/Squidex/app/shared/components/asset-dialog.component.html

@@ -28,7 +28,7 @@
             </div>
         
             <div class="form-group">
-                <label for="tags">Tags</label>
+                <label>Tags</label>
                 
                 <sqx-control-errors for="tags" [submitted]="annotateForm.submitted | async"></sqx-control-errors>
 

src/Squidex/app/shared/components/table-header.component.ts

@@ -39,7 +39,7 @@ export class TableHeaderComponent {
     public sortingChange = new EventEmitter<Sorting>();
 
     public sort() {
-        if (!!this.sortable) {
+        if (this.sortable) {
             if (!this.sorting || this.sorting !== 'Ascending') {
                 this.sorting = 'Ascending';
             } else {

src/Squidex/app/shared/services/comments.service.spec.ts

@@ -87,7 +87,7 @@ describe('CommentsService', () => {
         let comment: CommentDto;
 
         commentsService.postComment('my-app', 'my-comments', new UpsertCommentDto('text1')).subscribe(result => {
-            comment = <CommentDto>result;
+            comment = result;
         });
 
         const req = httpMock.expectOne('http://service/p/api/apps/my-app/comments/my-comments');

src/Squidex/app/shared/state/contents.forms.ts

@@ -391,7 +391,7 @@ export class EditContentForm extends Form<FormGroup> {
                 const fieldValue = value ? value[field.name] || {} : {};
 
                 const addControls = (key: string, language: AppLanguageDto | null) => {
-                    const partitionValidators = FieldValidatorsFactory.createValidators(field, language !== null && language.isOptional);
+                    const partitionValidators = FieldValidatorsFactory.createValidators(field, !!language && language.isOptional);
                     const partitionForm = new FormArray([], partitionValidators);
 
                     const partitionValue = fieldValue[key];

src/Squidex/app/shared/state/schemas.state.ts

@@ -349,10 +349,12 @@ function buildCategories(categories: { [name: string]: boolean }, schemas: Immut
     categories = { ...categories };
 
     for (let category in categories) {
+        if (categories.hasOwnProperty(category)) {
             if (!categories[category]) {
                 delete categories[category];
             }
         }
+    }
     for (let schema of schemas.values) {
         categories[schema.category || ''] = false;
     }

src/Squidex/wwwroot/_theme.html

@@ -51,7 +51,7 @@
 
                     <div class="bs-component">
                         <nav class="navbar navbar-toggleable-md navbar-dark bg-primary">
-                            <button type="button" classnavbar-toggler navbar-toggler-right">
+                            <button type="button" class="navbar-toggler navbar-toggler-right">
                                 <span class="navbar-toggler-icon"></span>
                             </button>
 
@@ -83,7 +83,7 @@
 
                     <div class="bs-component">
                         <nav class="navbar navbar-toggleable-md navbar-dark bg-inverse">
-                            <button type="button" classnavbar-toggler navbar-toggler-right">
+                            <button type="button" class="navbar-toggler navbar-toggler-right">
                                 <span class="navbar-toggler-icon"></span>
                             </button>
 

src/Squidex/wwwroot/scripts/editor-sdk.js

@@ -39,7 +39,7 @@ function SquidexFormField() {
         if (height !== newHeight) {
             height = newHeight;
 
-            window.parent.postMessage({ type: 'resize', height: height }, '*')
+            window.parent.postMessage({ type: 'resize', height: height }, '*');
         }
     }, 500);
 

tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppGrainTests.cs

@@ -171,7 +171,7 @@ namespace Squidex.Domain.Apps.Entities.Apps
 
             LastEvents
                 .ShouldHaveSameEvents(
-                    CreateEvent(new AppContributorAssigned { ContributorId = contributorId, Role = Role.Editor, IsNew = true })
+                    CreateEvent(new AppContributorAssigned { ContributorId = contributorId, Role = Role.Editor, IsAdded = true })
                 );
         }
 

tests/Squidex.Domain.Apps.Entities.Tests/Apps/Invitation/InvitationEmailEventConsumerTests.cs

@@ -180,7 +180,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Invitation
                 AppId = new NamedId<Guid>(Guid.NewGuid(), appName),
                 ContributorId = assigneeId,
                 IsCreated = isNewUser,
-                IsNew = isNewContributor,
+                IsAdded = isNewContributor,
             };
 
             var envelope = Envelope.Create(@event);