Merge branch 'master' into nitish/argocd-plugin-support

Author: nitishfy

docs/operator-manual/declarative-setup.md

@@ -1199,6 +1199,7 @@ Notes:
 * Quote globs in your YAML to avoid parsing errors.
 * Invalid globs result in the whole rule being ignored.
 * If you add a rule that matches existing resources, these will appear in the interface as `OutOfSync`.
+* Some excluded objects may already be in the controller cache. A restart of the controller will be necessary to remove them from the Application View.
 
 ## Mask sensitive Annotations on Secrets
 

ui/src/app/applications/components/application-resource-tree/application-resource-tree.scss

@@ -139,6 +139,9 @@
             box-shadow: 1px 1px 1px $argo-color-gray-4;
             background-color: white;
             margin-left: 215px;
+            @include themify($themes) {
+                background-color: themed('background-2');
+            }
 
             .theme-dark & {
                 box-shadow: 1px 1px 1px $argo-color-gray-7;

ui/src/app/applications/components/applications-list/applications-filter.tsx

@@ -7,6 +7,7 @@ import {AppsListPreferences, services} from '../../../shared/services';
 import {Filter, FiltersGroup} from '../filter/filter';
 import * as LabelSelector from '../label-selector';
 import {ComparisonStatusIcon, getAppDefaultSource, HealthStatusIcon} from '../utils';
+import {formatClusterQueryParam} from '../../../shared/utils';
 
 export interface FilterResult {
     repos: boolean;
@@ -185,10 +186,7 @@ const ClusterFilter = (props: AppFilterProps) => {
         if (!cluster) {
             return dest.server || dest.name;
         }
-        if (cluster.name === cluster.server) {
-            return cluster.name;
-        }
-        return `${cluster.name} (${cluster.server})`;
+        return formatClusterQueryParam(cluster);
     };
 
     const [clusters, loading, error] = useData(() => services.clusters.list());

ui/src/app/settings/components/cluster-details/cluster-details.tsx

@@ -2,14 +2,15 @@ import * as classNames from 'classnames';
 import * as moment from 'moment';
 import * as React from 'react';
 import {FieldApi, FormField as ReactFormField, Text} from 'react-form';
-import {RouteComponentProps} from 'react-router-dom';
+import {RouteComponentProps, Link} from 'react-router-dom';
 import {from, timer} from 'rxjs';
 import {mergeMap} from 'rxjs/operators';
 
 import {FormField, Ticker} from 'argo-ui';
 import {ConnectionStateIcon, DataLoader, EditablePanel, Page, Timestamp, MapInputField} from '../../../shared/components';
 import {Cluster} from '../../../shared/models';
 import {services} from '../../../shared/services';
+import {formatClusterQueryParam} from '../../../shared/utils';
 
 function isRefreshRequested(cluster: Cluster): boolean {
     return cluster.info.connectionState.attemptedAt && cluster.refreshRequestedAt && moment(cluster.info.connectionState.attemptedAt).isBefore(moment(cluster.refreshRequestedAt));
@@ -86,6 +87,23 @@ export const ClusterDetails = (props: RouteComponentProps<{server: string}>) =>
                                     view: ((cluster.namespaces || []).length === 0 && 'All namespaces') || cluster.namespaces.join(', '),
                                     edit: formApi => <FormField formApi={formApi} field='namespaces' component={NamespacesEditor} />
                                 },
+                                {
+                                    title: 'APPLICATIONS',
+                                    view: (
+                                        <div>
+                                            <DataLoader load={() => services.applications.list([])}>
+                                                {apps => (
+                                                    <Link to={`/applications?cluster=${formatClusterQueryParam(cluster)}`}>
+                                                        {
+                                                            apps.items.filter(app => app.spec.destination.name === cluster.name || app.spec.destination.server === cluster.server)
+                                                                .length
+                                                        }
+                                                    </Link>
+                                                )}
+                                            </DataLoader>
+                                        </div>
+                                    )
+                                },
                                 {
                                     title: 'LABELS',
                                     view: Object.keys(cluster.labels || [])

ui/src/app/settings/components/project-details/project-details.tsx

@@ -4,6 +4,7 @@ import * as PropTypes from 'prop-types';
 import * as React from 'react';
 import {FormApi, Text} from 'react-form';
 import {RouteComponentProps} from 'react-router';
+import {Link} from 'react-router-dom';
 
 import {BadgePanel, CheckboxField, DataLoader, EditablePanel, ErrorNotification, MapInputField, Page, Query} from '../../../shared/components';
 import {AppContext, Consumer, AuthSettingsCtx} from '../../../shared/context';
@@ -610,6 +611,16 @@ export class ProjectDetails extends React.Component<RouteComponentProps<{name: s
                                     <DataLoader load={() => services.projects.getLinks(proj.metadata.name)}>{links => <DeepLinks links={links.items} />}</DataLoader>
                                 </div>
                             )
+                        },
+                        {
+                            title: 'APPLICATIONS',
+                            view: (
+                                <div>
+                                    <DataLoader load={() => services.applications.list([proj.metadata.name])}>
+                                        {apps => <Link to={'/applications?proj=' + proj.metadata.name}>{apps.items.length}</Link>}
+                                    </DataLoader>
+                                </div>
+                            )
                         }
                     ]}
                 />

ui/src/app/shared/services/applications-service.ts

@@ -482,9 +482,6 @@ export class ApplicationsService {
         if (tail) {
             search.set('tailLines', tail.toString());
         }
-        if (sinceSeconds) {
-            search.set('sinceSeconds', sinceSeconds.toString());
-        }
         if (untilTime) {
             search.set('untilTime', untilTime);
         }
@@ -498,7 +495,11 @@ export class ApplicationsService {
             search.set('matchCase', matchCase.toString());
         }
         // The API requires that this field be set to a non-empty string.
-        search.set('sinceSeconds', '0');
+        if (sinceSeconds) {
+            search.set('sinceSeconds', sinceSeconds.toString());
+        } else {
+            search.set('sinceSeconds', '0');
+        }
         return search;
     }
 

ui/src/app/shared/utils.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import {Cluster} from './models';
 
 export function hashCode(str: string) {
     let hash = 0;
@@ -104,3 +105,10 @@ export const useTheme = (props: {theme: string}) => {
 
     return [theme];
 };
+
+export const formatClusterQueryParam = (cluster: Cluster) => {
+    if (cluster.name === cluster.server) {
+        return cluster.name;
+    }
+    return `${cluster.name} (${cluster.server})`;
+};