-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(ngrid): refactor the cell rendering engine and refactor the …
…group definitions Closes #123 Closes #131 BREAKING CHANGE: `prop` and `span` are deprecated from `PblColumnGroupDefinition` and will be removed from version 4.0.0 `prop` and `span` are removed from `PblColumnGroup` and instread columnIds list is used
- Loading branch information
1 parent
480ef4d
commit 35cb147
Showing
66 changed files
with
1,637 additions
and
580 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| "coeff", | ||
| "deserialize", | ||
| "deserializing", | ||
| "focusable", | ||
| "lunr", | ||
| "mdast", | ||
| "pebula", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,220 @@ | ||
| [backends] | ||
| {{range $aggName, $aggServices := getGroupedServices .Services }} | ||
| [backends."{{ $aggName }}"] | ||
| {{range $service := $aggServices }} | ||
| {{range $partition := $service.Partitions }} | ||
| {{range $instance := $partition.Instances }} | ||
| [backends."{{ $aggName }}".servers."{{ $service.ID }}-{{ $instance.ID }}"] | ||
| weight = {{ getGroupedWeight $service }} | ||
| {{ $endpointName := getLabelValue $service "traefik.servicefabric.endpointname" "" }} | ||
| {{if $endpointName }} | ||
| url = "{{ getNamedEndpoint $instance $endpointName }}" | ||
| {{else}} | ||
| url = "{{ getDefaultEndpoint $instance }}" | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{range $service := .Services }} | ||
| {{if isEnabled $service }} | ||
| {{range $partition := $service.Partitions }} | ||
| {{if isStateless $service }} | ||
| {{ $backendName := $service.Name }} | ||
| [backends."{{ $backendName }}"] | ||
| {{ $circuitBreaker := getCircuitBreaker $service }} | ||
| {{if $circuitBreaker }} | ||
| [backends."{{ $backendName }}".circuitBreaker] | ||
| expression = "{{ $circuitBreaker.Expression }}" | ||
| {{end}} | ||
| {{ $loadBalancer := getLoadBalancer $service }} | ||
| {{if $loadBalancer }} | ||
| [backends."{{ $backendName }}".loadBalancer] | ||
| method = "{{ $loadBalancer.Method }}" | ||
| sticky = {{ $loadBalancer.Sticky }} | ||
| {{if $loadBalancer.Stickiness }} | ||
| [backends."{{ $backendName }}".loadBalancer.stickiness] | ||
| cookieName = "{{ $loadBalancer.Stickiness.CookieName }}" | ||
| {{end}} | ||
| {{end}} | ||
| {{ $maxConn := getMaxConn $service }} | ||
| {{if $maxConn }} | ||
| [backends."{{ $backendName }}".maxConn] | ||
| extractorFunc = "{{ $maxConn.ExtractorFunc }}" | ||
| amount = {{ $maxConn.Amount }} | ||
| {{end}} | ||
| {{ $healthCheck := getHealthCheck $service }} | ||
| {{if $healthCheck }} | ||
| [backends."{{ $backendName }}".healthCheck] | ||
| path = "{{ $healthCheck.Path }}" | ||
| port = {{ $healthCheck.Port }} | ||
| interval = "{{ $healthCheck.Interval }}" | ||
| hostname = "{{ $healthCheck.Hostname }}" | ||
| {{if $healthCheck.Headers }} | ||
| [backends."{{ $backendName }}".healthCheck.headers] | ||
| {{range $k, $v := $healthCheck.Headers }} | ||
| {{$k}} = "{{$v}}" | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{range $instance := $partition.Instances}} | ||
| [backends."{{ $service.Name }}".servers."{{ $instance.ID }}"] | ||
| weight = {{ getWeight $service }} | ||
| {{ $endpointName := getLabelValue $service "traefik.servicefabric.endpointname" "" }} | ||
| {{if $endpointName }} | ||
| {{ $endpointName := getNamedEndpoint $instance $endpointName }} | ||
| {{else}} | ||
| {{ $endpointName := getDefaultEndpoint $instance }} | ||
| {{end}} | ||
| {{if getLabelValue $service "traefik.protocol" "" }} | ||
| {{ $endpointName := regexReplaceAll "$https" $endpointName getLabelValue $service "traefik.protocol" }} | ||
| {{ $endpointName := regexReplaceAll "$http" $endpointName getLabelValue $service "traefik.protocol" }} | ||
| {{end}} | ||
| url = "{{ $endpointName }}" | ||
| {{end}} | ||
| {{else if isStateful $service}} | ||
| {{range $replica := $partition.Replicas}} | ||
| {{if isPrimary $replica}} | ||
| {{ $backendName := getBackendName $service $partition }} | ||
| [backends."{{ $backendName }}".servers."{{ $replica.ID }}"] | ||
| weight = 1 | ||
| {{ $endpointName := getLabelValue $service "traefik.servicefabric.endpointname" "" }} | ||
| {{if $endpointName }} | ||
| url = "{{ getNamedEndpoint $replica $endpointName }}" | ||
| {{else}} | ||
| url = "{{ getDefaultEndpoint $replica }}" | ||
| {{end}} | ||
| [backends."{{$backendName}}".LoadBalancer] | ||
| method = "drr" | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| [frontends] | ||
| {{range $groupName, $groupServices := getGroupedServices .Services }} | ||
| {{ $service := index $groupServices 0 }} | ||
| [frontends."{{ $groupName }}"] | ||
| backend = "{{ $groupName }}" | ||
| priority = 50 | ||
| {{range $key, $value := getFrontendRules $service }} | ||
| [frontends."{{ $groupName }}".routes."{{ $key }}"] | ||
| rule = "{{ $value }}" | ||
| {{end}} | ||
| {{end}} | ||
| {{range $service := .Services }} | ||
| {{if isEnabled $service }} | ||
| {{ $frontendName := $service.Name }} | ||
| {{if isStateless $service }} | ||
| [frontends."frontend-{{ $frontendName }}"] | ||
| backend = "{{ $service.Name }}" | ||
| passHostHeader = {{ getPassHostHeader $service }} | ||
| passTLSCert = {{ getPassTLSCert $service }} | ||
| priority = {{ getPriority $service }} | ||
| {{ $entryPoints := getEntryPoints $service }} | ||
| {{if $entryPoints }} | ||
| entryPoints = [{{range $entryPoints }} | ||
| "{{.}}", | ||
| {{end}}] | ||
| {{end}} | ||
| {{ $basicAuth := getBasicAuth $service }} | ||
| {{if $basicAuth }} | ||
| basicAuth = [{{range $basicAuth }} | ||
| "{{.}}", | ||
| {{end}}] | ||
| {{end}} | ||
| {{ $whitelist := getWhiteList $service }} | ||
| {{if $whitelist }} | ||
| [frontends."frontend-{{ $frontendName }}".whiteList] | ||
| sourceRange = [{{range $whitelist.SourceRange }} | ||
| "{{.}}", | ||
| {{end}}] | ||
| useXForwardedFor = {{ $whitelist.UseXForwardedFor }} | ||
| {{end}} | ||
| {{ $redirect := getRedirect $service }} | ||
| {{if $redirect }} | ||
| [frontends."frontend-{{ $frontendName }}".redirect] | ||
| entryPoint = "{{ $redirect.EntryPoint }}" | ||
| regex = "{{ $redirect.Regex }}" | ||
| replacement = "{{ $redirect.Replacement }}" | ||
| permanent = {{ $redirect.Permanent }} | ||
| {{end}} | ||
| {{ $errorPages := getErrorPages $service }} | ||
| {{if $errorPages }} | ||
| [frontends."frontend-{{ $frontendName }}".errors] | ||
| {{range $pageName, $page := $errorPages }} | ||
| [frontends."frontend-{{ $frontendName }}".errors."{{ $pageName }}"] | ||
| status = [{{range $page.Status }} | ||
| "{{.}}", | ||
| {{end}}] | ||
| backend = "{{ $page.Backend }}" | ||
| query = "{{ $page.Query }}" | ||
| {{end}} | ||
| {{end}} | ||
| {{ $headers := getHeaders $service }} | ||
| {{if $headers }} | ||
| [frontends."frontend-{{ $frontendName }}".headers] | ||
| SSLRedirect = {{ $headers.SSLRedirect }} | ||
| SSLTemporaryRedirect = {{ $headers.SSLTemporaryRedirect }} | ||
| SSLHost = "{{ $headers.SSLHost }}" | ||
| STSSeconds = {{ $headers.STSSeconds }} | ||
| STSIncludeSubdomains = {{ $headers.STSIncludeSubdomains }} | ||
| STSPreload = {{ $headers.STSPreload }} | ||
| ForceSTSHeader = {{ $headers.ForceSTSHeader }} | ||
| FrameDeny = {{ $headers.FrameDeny }} | ||
| CustomFrameOptionsValue = "{{ $headers.CustomFrameOptionsValue }}" | ||
| ContentTypeNosniff = {{ $headers.ContentTypeNosniff }} | ||
| BrowserXSSFilter = {{ $headers.BrowserXSSFilter }} | ||
| CustomBrowserXSSValue = "{{ $headers.CustomBrowserXSSValue }}" | ||
| ContentSecurityPolicy = "{{ $headers.ContentSecurityPolicy }}" | ||
| PublicKey = "{{ $headers.PublicKey }}" | ||
| ReferrerPolicy = "{{ $headers.ReferrerPolicy }}" | ||
| IsDevelopment = {{ $headers.IsDevelopment }} | ||
| {{if $headers.AllowedHosts }} | ||
| AllowedHosts = [{{range $headers.AllowedHosts }} | ||
| "{{.}}", | ||
| {{end}}] | ||
| {{end}} | ||
| {{if $headers.HostsProxyHeaders }} | ||
| HostsProxyHeaders = [{{range $headers.HostsProxyHeaders }} | ||
| "{{.}}", | ||
| {{end}}] | ||
| {{end}} | ||
| {{if $headers.CustomRequestHeaders }} | ||
| [frontends."frontend-{{ $frontendName }}".headers.customRequestHeaders] | ||
| {{range $k, $v := $headers.CustomRequestHeaders }} | ||
| {{$k}} = "{{$v}}" | ||
| {{end}} | ||
| {{end}} | ||
| {{if $headers.CustomResponseHeaders }} | ||
| [frontends."frontend-{{ $frontendName }}".headers.customResponseHeaders] | ||
| {{range $k, $v := $headers.CustomResponseHeaders }} | ||
| {{$k}} = "{{$v}}" | ||
| {{end}} | ||
| {{end}} | ||
| {{if $headers.SSLProxyHeaders }} | ||
| [frontends."frontend-{{ $frontendName }}".headers.SSLProxyHeaders] | ||
| {{range $k, $v := $headers.SSLProxyHeaders }} | ||
| {{$k}} = "{{$v}}" | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{range $key, $value := getFrontendRules $service }} | ||
| [frontends."frontend-{{ $frontendName }}".routes."{{ $key }}"] | ||
| rule = "{{ $value }}" | ||
| {{end}} | ||
| {{else if isStateful $service }} | ||
| {{range $partition := $service.Partitions }} | ||
| {{ $partitionId := $partition.PartitionInformation.ID }} | ||
| {{ $rule := getLabelValue $service (print "traefik.frontend.rule.partition." $partitionId) "" }} | ||
| {{if $rule }} | ||
| [frontends."{{ $service.Name }}/{{ $partitionId }}"] | ||
| backend = "{{ getBackendName $service $partition }}" | ||
| [frontends."{{ $service.Name }}/{{ $partitionId }}".routes.default] | ||
| rule = "{{ $rule }}" | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} | ||
| {{end}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
apps/ngrid-demo-app/content/features/grid/infinite-scroll/index-based-paging.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <pbl-ngrid [dataSource]="ds" [columns]="columns"> | ||
| <mat-progress-bar *ngIf="ds.adapter.virtualRowsLoading | async" mode="indeterminate"></mat-progress-bar> | ||
|
|
||
| <pbl-ngrid-row in *pblNgridInfiniteVirtualRowRef="let row; gridInstance as gridInstance" class="pbl-ngrid-infinite-virtual-row" [grid]="gridInstance" [row]="row"> | ||
| <pbl-ngrid-row in *pblNgridInfiniteVirtualRowDef="let row; gridInstance as gridInstance" class="pbl-ngrid-infinite-virtual-row" [grid]="gridInstance" [row]="row"> | ||
| </pbl-ngrid-row> | ||
|
|
||
| </pbl-ngrid> |
2 changes: 1 addition & 1 deletion
2
apps/ngrid-demo-app/src/app/demo-home-page/demo-home-page.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.