Fix pod table pagination conflicts#3355
Closed
KlapTrap wants to merge 22 commits into
Closed
Conversation
…-move # Conflicts: # custom-src/frontend/app/custom/custom-routing.module.ts # custom-src/frontend/app/custom/custom.module.ts # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html # custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts # custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts # custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts # custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts # custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html # custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts # custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/helm-release-services/helm-release-services-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/helm-release-services/helm-release-services-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kube-sort.helper.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts # custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts # custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html # custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss # custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts # custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts # custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts # custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts # custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts # custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts # custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts # custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts # custom-src/frontend/app/custom/kubernetes/store/kube.types.ts # custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts # custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts # custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts # custom-src/frontend/app/custom/suse-login/suse-login.component.html # custom-src/frontend/app/custom/suse-login/suse-login.component.scss # custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts # custom-src/frontend/app/custom/suse-login/suse-login.component.ts
January upstream sync
Sync upstream
Upstream merge
|
✅ Hey KlapTrap! The commit authors and yourself have already signed the CLA. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #116