Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-24 09:50:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Shows version in UI. (#2502)

Browse source
This commit is contained in:
Alex Collins 2019-10-22 11:11:54 -07:00 committed by GitHub
parent 2d73fea0a5
commit a55087b6fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/src/app/app.tsx
View file

@ -161,7 +161,7 @@ export class App extends React.Component<{}, { popupProps: PopupProps, error: Er
<route.component {...routeProps}/>
</div>
) : (
<Layout navItems={navItems}>
<Layout navItems={navItems} version={() => <DataLoader load={() => services.version.version()}>{(msg) => msg.Version}</DataLoader>}>
<route.component {...routeProps}/>
</Layout>
)

4
ui/src/app/shared/models.ts
View file

@ -618,3 +618,7 @@ export interface ApplicationSyncWindowState {
canSync: boolean;
}
export interface VersionMessage {
Version: string;
}

3
ui/src/app/shared/services/index.ts
View file

@ -6,6 +6,7 @@ import { ProjectsService } from './projects-service';
import { RepositoriesService } from './repo-service';
import { RepoCredsService } from './repocreds-service';
import { UserService } from './user-service';
import {VersionService} from './version-service';
import { ViewPreferencesService } from './view-preferences-service';
export interface Services {
@ -18,6 +19,7 @@ export interface Services {
clusters: ClustersService;
projects: ProjectsService;
viewPreferences: ViewPreferencesService;
version: VersionService;
}
export const services: Services = {
@ -30,6 +32,7 @@ export const services: Services = {
repocreds: new RepoCredsService(),
projects: new ProjectsService(),
viewPreferences: new ViewPreferencesService(),
version: new VersionService(),
};
export { ProjectParams, ProjectRoleParams, CreateJWTTokenParams, DeleteJWTTokenParams, JWTTokenResponse } from './projects-service';

1
ui/src/app/shared/services/requests.ts
View file

@ -35,6 +35,7 @@ export default {
setApiRoot(val: string) {
apiRoot = val;
},
agent,
onError: onError.asObservable().filter((err) => err != null),
get(url: string) {
return initHandlers(agent.get(`${apiRoot}${url}`));

8
ui/src/app/shared/services/version-service.ts Normal file
View file

@ -0,0 +1,8 @@
import {VersionMessage} from '../models';
import requests from './requests';
export class VersionService {
public version(): Promise<VersionMessage> {
return requests.agent.get('/api/version').then((res) => res.body as VersionMessage);
}
}

2
ui/yarn.lock
View file

@ -882,7 +882,7 @@ are-we-there-yet@~1.1.2:
"argo-ui@https://github.com/argoproj/argo-ui.git":
version "1.0.0"
resolved "https://github.com/argoproj/argo-ui.git#f12c7f443d8108289276feafe47d0161c9de2390"
resolved "https://github.com/argoproj/argo-ui.git#7564d8b211e3ad392212133011445583b4902097"
dependencies:
"@fortawesome/fontawesome-free" "^5.8.1"
"@tippy.js/react" "^2.1.2"