Remove parameters field from ApplicationStatus (#83)

argoproj · Dec 5, 2018 · d7b89f5 · d7b89f5
1 parent 39f8662
commit d7b89f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/app/applications/components/application-details/application-details.tsx b/src/app/applications/components/application-details/application-details.tsx
@@ -242,9 +242,15 @@ export class ApplicationDetails extends React.Component<RouteComponentProps<{ na
                                     <Tabs navTransparent={true} tabs={[{
                                         title: 'SUMMARY', key: 'summary', content: <ApplicationSummary app={application} updateApp={(app) => this.updateApp(app)}/>,
                                     }, {
-                                        title: 'PARAMETERS', key: 'parameters', content: <ParametersPanel
-                                            updateApp={(app) => this.updateApp(app)}
-                                            app={application}/>,
+                                        title: 'PARAMETERS', key: 'parameters', content: (
+                                            <DataLoader
+                                                input={{name: application.metadata.name, revision: application.spec.source.targetRevision}}
+                                                load={(input) => services.applications.getManifest(input.name, input.revision).then((res) => res.params || [])}>
+                                            {(params: appModels.ComponentParameter[]) =>
+                                                <ParametersPanel params={params} updateApp={(app) => this.updateApp(app)} app={application}/>
+                                            }
+                                            </DataLoader>
+                                        ),
                                     }, {
                                         title: 'EVENTS', key: 'event', content: <ApplicationResourceEvents applicationName={application.metadata.name}/>,
                                     }]}/>

diff --git a/src/app/applications/components/parameters-panel/parameters-panel.tsx b/src/app/applications/components/parameters-panel/parameters-panel.tsx
@@ -28,8 +28,8 @@ function decodeParamNames(params: any, srcNames: {[name: string]: string}) {
     });
 }
 
-export const ParametersPanel = (props: { app: models.Application, updateApp: (app: models.Application) => Promise<any>}) => {
-    const componentParams = getParamsWithOverridesInfo(props.app.status.parameters || [], props.app.spec.source.componentParameterOverrides);
+export const ParametersPanel = (props: { app: models.Application, params: models.ComponentParameter[], updateApp: (app: models.Application) => Promise<any>}) => {
+    const componentParams = getParamsWithOverridesInfo(props.params || [], props.app.spec.source.componentParameterOverrides);
 
     const src: any = {};
     const srcNames: {[name: string]: string} = {};

diff --git a/src/app/shared/models.ts b/src/app/shared/models.ts
@@ -172,7 +172,6 @@ export interface ApplicationSpec {
 export interface RevisionHistory {
     id: number;
     revision: string;
-    params: ComponentParameter[];
     componentParameterOverrides: ComponentParameter[];
     deployedAt: models.Time;
 }
@@ -250,7 +249,6 @@ export interface ApplicationStatus {
     sync: SyncStatus;
     conditions?: ApplicationCondition[];
     history: RevisionHistory[];
-    parameters: ComponentParameter[];
     health: HealthStatus;
     operationState?: OperationState;
 }