Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: show correct app version in info #716

Merged
merged 1 commit into from
Mar 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/console/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flyteorg/console",
"version": "0.0.11",
"version": "0.0.12",
"description": "Flyteconsole main app module",
"main": "./dist/index.js",
"module": "./lib/index.js",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as React from 'react';
import { makeStyles, Theme } from '@material-ui/core/styles';
import classnames from 'classnames';
import { AppInfo, VersionInfo } from '@flyteorg/components';
import { FlyteLogo } from '@flyteorg/ui-atoms';
import { useCommonStyles } from 'components/common/styles';
import * as React from 'react';
import { Link } from 'react-router-dom';
import { Routes } from 'routes/routes';
import { FeatureFlag, useFeatureFlag } from 'basics/FeatureFlags';
Expand All @@ -15,8 +15,6 @@ import { OnlyMine } from './OnlyMine';
import { FlyteNavItem } from './utils';
import t, { patternKey } from './strings';

const { version: platformVersion } = require('../../../package.json');

const useStyles = makeStyles((theme: Theme) => ({
spacer: {
flexGrow: 1,
Expand All @@ -33,19 +31,37 @@ interface DefaultAppBarProps {

/** Renders the default content for the app bar, which is the logo and help links */
export const DefaultAppBarContent = (props: DefaultAppBarProps) => {
const [platformVersion, setPlatformVersion] = React.useState('');
const [consoleVersion, setConsoleVersion] = React.useState('');
const commonStyles = useCommonStyles();
const styles = useStyles();

const isFlagEnabled = useFeatureFlag(FeatureFlag.OnlyMine);
const { adminVersion } = useAdminVersion();
const isGAEnabled = env.ENABLE_GA === 'true' && env.GA_TRACKING_ID !== '';

React.useEffect(() => {
try {
const { version } = require('../../../../../website/package.json');
const { version: packageVersion } = require('../../../package.json');

setPlatformVersion(version);
setConsoleVersion(packageVersion);
} catch {
/* no-op */
}
}, []);
const versions: VersionInfo[] = [
{
name: t('versionConsoleUi'),
version: platformVersion,
url: `https://github.com/flyteorg/flyteconsole/releases/tag/v${platformVersion}`,
},
{
name: t('versionConsolePackage'),
version: consoleVersion,
url: `https://github.com/flyteorg/flyteconsole/tree/master/packages/console`,
},
{
name: t('versionAdmin'),
version: adminVersion,
Expand Down Expand Up @@ -81,3 +97,5 @@ export const DefaultAppBarContent = (props: DefaultAppBarProps) => {
</>
);
};

export default DefaultAppBarContent;
20 changes: 12 additions & 8 deletions packages/console/src/components/Navigation/NavBar.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
import * as React from 'react';
import { Suspense, lazy } from 'react';
import AppBar from '@material-ui/core/AppBar';
import Toolbar from '@material-ui/core/Toolbar';
import { navBarContentId } from 'common/constants';
import { COLOR_SPECTRUM } from 'components/Theme/colorSpectrum';
import { whiteColor } from 'components/Theme/constants';
import { FlyteNavigation } from '@flyteorg/common';
import * as React from 'react';
import { DefaultAppBarContent } from './DefaultAppBarContent';
import { getFlyteNavigationData } from './utils';

export interface NavBarProps {
useCustomContent?: boolean;
navigationData?: FlyteNavigation;
}

const DefaultAppBarContent = lazy(() => import('./DefaultAppBarContent'));

/** Contains all content in the top navbar of the application. */
export const NavBar = (props: NavBarProps) => {
const navData = props.navigationData ?? getFlyteNavigationData();
const content = props.useCustomContent ? (
<div id={navBarContentId} />
) : (
<DefaultAppBarContent
items={navData?.items ?? []}
console={navData?.console}
/>
<Suspense fallback={null}>
<DefaultAppBarContent
items={navData?.items ?? []}
console={navData?.console}
/>
</Suspense>
);

return (
Expand All @@ -40,3 +42,5 @@ export const NavBar = (props: NavBarProps) => {
</AppBar>
);
};

export default NavBar;
1 change: 1 addition & 0 deletions packages/console/src/components/Navigation/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { createLocalizedString } from '@flyteorg/locale';
const str = {
login: 'Login',
versionConsoleUi: 'UI Version',
versionConsolePackage: 'Package Version',
versionAdmin: 'Admin Version',
versionGoogleAnalytics: 'Google Analytics',
gaActive_: 'Active',
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@flyteorg/common": "^0.0.3",
"@flyteorg/console": "^0.0.11",
"@flyteorg/console": "^0.0.12",
"long": "^4.0.0",
"protobufjs": "~6.11.3",
"react-ga4": "^1.4.1",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@ __metadata:
resolution: "@flyteconsole/client-app@workspace:website"
dependencies:
"@flyteorg/common": ^0.0.3
"@flyteorg/console": ^0.0.11
"@flyteorg/console": ^0.0.12
"@types/long": ^3.0.32
long: ^4.0.0
protobufjs: ~6.11.3
Expand Down Expand Up @@ -2034,7 +2034,7 @@ __metadata:
languageName: unknown
linkType: soft

"@flyteorg/console@^0.0.11, @flyteorg/console@workspace:packages/console":
"@flyteorg/console@^0.0.12, @flyteorg/console@workspace:packages/console":
version: 0.0.0-use.local
resolution: "@flyteorg/console@workspace:packages/console"
dependencies:
Expand Down