Remove changes from argoproj#3165

rbreeze · Jun 4, 2020 · 7d9cbe0 · 7d9cbe0
1 parent 6c686d8
commit 7d9cbe0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -754,11 +754,6 @@
             "description": "The continue option should be set when retrieving more results from the server. Since this value is\nserver defined, clients may only use the continue value from a previous query result with identical\nquery parameters (except for the value of continue) and the server may reject a continue value it\ndoes not recognize. If the specified continue value is no longer valid whether due to expiration\n(generally five to fifteen minutes) or a configuration change on the server, the server will\nrespond with a 410 ResourceExpired error together with a continue token. If the client needs a\nconsistent list, it must restart their list without the continue field. Otherwise, the client may\nsend another list request with the token received with the 410 error, the server will respond with\na list starting from the next key, but from the latest snapshot, which is inconsistent from the\nprevious list results - objects that are created, modified, or deleted after the first list request\nwill be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last\nresourceVersion value returned by the server and not miss any modifications.",
             "name": "listOptions.continue",
             "in": "query"
-          },
-          {
-            "type": "string",
-            "name": "fields",
-            "in": "query"
           }
         ],
         "responses": {

diff --git a/pkg/apiclient/workflow/workflow.proto b/pkg/apiclient/workflow/workflow.proto
@@ -89,7 +89,6 @@ message WorkflowDeleteResponse {
 message WatchWorkflowsRequest {
     string namespace = 1;
     k8s.io.apimachinery.pkg.apis.meta.v1.ListOptions listOptions = 2;
-    string fields = 3;
 }
 
 message WorkflowWatchEvent {

diff --git a/pkg/apiclient/workflow/workflow.swagger.json b/pkg/apiclient/workflow/workflow.swagger.json
@@ -98,12 +98,6 @@
             "in": "query",
             "required": false,
             "type": "string"
-          },
-          {
-            "name": "fields",
-            "in": "query",
-            "required": false,
-            "type": "string"
           }
         ],
         "tags": [

diff --git a/ui/src/app/shared/services/workflows-service.ts b/ui/src/app/shared/services/workflows-service.ts
@@ -32,11 +32,7 @@ export class WorkflowsService {
     }
 
     public watch(filter: {namespace?: string; name?: string; phases?: Array<string>; labels?: Array<string>}): Observable<models.kubernetes.WatchEvent<Workflow>> {
-        const params = this.queryParams(filter);
-        params.push(
-            `fields=result.object.metadata.name,result.object.metadata.namespace,result.object.status.finishedAt,result.object.status.startedAt,result.object.status.phase`
-        );
-        const url = `api/v1/workflow-events/${filter.namespace || ''}?${params.join('&')}`;
+        const url = `api/v1/workflow-events/${filter.namespace || ''}?${this.queryParams(filter).join('&')}`;
 
         return requests.loadEventSource(url, true).map(data => JSON.parse(data).result as models.kubernetes.WatchEvent<Workflow>);
     }

diff --git a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss
@@ -15,6 +15,7 @@
 
     &:first-child {
       padding-top: 0;
+      border-top: none;
     }
 
     &:last-child {
@@ -39,12 +40,15 @@
   }
 
   &__labels {
-    border-top: none;
     &--list {
       margin-top: 0.5em; 
     }
   }
 
+  &__message {
+    border-top: none;
+  }
+
   .tag {
     line-height: normal;
     background-color: $argo-color-gray-3;