Skip to content

Commit

Permalink
Merge pull request #1587 from memphisdev/bugfix-RND-399-the-indicatio…
Browse files Browse the repository at this point in the history
…n-for-update-in-the-ui-shouldnt-display-in-cloud-only-in-oss

Indication for update - only in oss
  • Loading branch information
SvetaMemphis authored Jan 1, 2024
2 parents f0cc987 + 9cc7d43 commit 773f522
Showing 1 changed file with 10 additions and 14 deletions.
24 changes: 10 additions & 14 deletions ui_src/src/domain/administration/softwareUpdates/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import { Checkbox } from 'antd';
import ImgUploader from './imgUploader';
import { LOCAL_STORAGE_USER_TYPE, LOCAL_STORAGE_ACCOUNT_ID } from 'const/localStorageConsts';
import Support from 'components/sideBar/support';
import FullLogoWhite from "assets/images/white-logo.svg";
import FullLogo from "assets/images/fullLogo.svg";
import FullLogoWhite from 'assets/images/white-logo.svg';
import FullLogo from 'assets/images/fullLogo.svg';

function SoftwareUpates({}) {
const [state, dispatch] = useContext(Context);
Expand Down Expand Up @@ -152,34 +152,30 @@ function SoftwareUpates({}) {
<div className="rows">
<div className="item-component">
<div className="title-component">
<div className="versions"
onClick={() => !isCloud() && isUpdateAvailable && window.open(latestVersionUrl, '_blank')}>
<div className="versions" onClick={() => !isCloud() && isUpdateAvailable && window.open(latestVersionUrl, '_blank')}>
<span className="logo-wrapper">
<img
src={getCompanyLogoSrc() || ''}
height="40"
className="logoimg"
alt="logo"
/>
<img src={getCompanyLogoSrc() || ''} height="40" className="logoimg" alt="logo" />
</span>
{isCloud() ? (
<div className="hostname">
<p>Account ID : </p>
<span>{localStorage.getItem(LOCAL_STORAGE_ACCOUNT_ID)}</span>
<Copy width="12" data={localStorage.getItem(LOCAL_STORAGE_ACCOUNT_ID)}/>
<Copy width="12" data={localStorage.getItem(LOCAL_STORAGE_ACCOUNT_ID)} />
</div>
) : (
<label className="curr-version">{version}</label>
<>
<label className="curr-version">{version}</label>
{isUpdateAvailable && <div className="red-dot" />}
</>
)}
{isUpdateAvailable && <div className="red-dot"/>}
</div>
<Button
width="200px"
height="36px"
placeholder={
<span className="change-log">
<label>View Change log</label>
<RedirectWhiteIcon alt="redirect"/>
<RedirectWhiteIcon alt="redirect" />
</span>
}
colorType="white"
Expand Down

0 comments on commit 773f522

Please sign in to comment.