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.

Sign up for GitHub

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

Jump to bottom

fix_inputs_on_FunctionDetails #1464

Merged
merged 1 commit into from
Nov 30, 2023
Merged

fix_inputs_on_FunctionDetails #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ui_src/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ import Overview from './domain/overview';
import Loader from './components/loader';
import Functions from './domain/functions';
import { Context } from './hooks/store';
import Profile from './domain/profile';
import pathDomains from './router';
import Users from './domain/users';

Expand Down
81 changes: 38 additions & 43 deletions ui_src/src/domain/functions/components/functionDetails/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
);

const buildTree = (files) => {
files = files.sort((a, b) => a.localeCompare(b));
files = files?.sort((a, b) => a.localeCompare(b));
let tree = [];
let root = {};
files.forEach((filePath, index) => {
files?.forEach((filePath, index) => {
const pathParts = filePath.split('/');
if (pathParts.length === 1) {
root = {
Expand Down Expand Up @@ -231,13 +231,13 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
?.replace(/`/g, '\\`');
};

const shortInstallBtn = selectedFunction?.installed_in_progress || (selectedFunction?.installed && !selectedFunction?.updates_available);
const installBtnPlaceholder = selectedFunction?.installed_in_progress ? (
const shortInstallBtn = metaData?.installed_in_progress || (metaData?.installed && !metaData?.updates_available);
const installBtnPlaceholder = metaData?.installed_in_progress ? (
''
) : selectedFunction?.installed ? (
<div className="code-btn">
{selectedFunction?.updates_available ? <BiDownload className="Install" /> : <DeleteIcon className="Uninstall" />}
{selectedFunction?.updates_available ? <label>Update</label> : null}
{metaData?.updates_available ? <BiDownload className="Install" /> : <DeleteIcon className="Uninstall" />}
{metaData?.updates_available ? <label>Update</label> : null}
</div>
) : (
<div className="code-btn">
Expand All @@ -247,8 +247,8 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
);

const handleInstallBtnClick = () => {
if (selectedFunction?.installed) {
if (selectedFunction?.updates_available) {
if (metaData?.installed) {
if (metaData?.updates_available) {
handleInstall();
} else handleUnInstall();
} else {
Expand All @@ -267,22 +267,22 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
)}

<div className="drawer-header ">
{selectedFunction?.image ? (
<img src={selectedFunction?.image} alt="Function icon" height="120px" width="120px" />
{metaData?.image ? (
<img src={metaData?.image} alt="Function icon" height="120px" width="120px" />
) : (
<FunctionIcon alt="Function icon" height="120px" width="120px" />
)}

<div className="right-side">
<div className="title">{selectedFunction?.function_name || selectedFunction?.name}</div>
<div className="title">{metaData?.function_name || metaData?.name}</div>
<div>
<deatils is="x3d">
<div className="function-owner">
{selectedFunction?.owner === OWNER && <MemphisFunctionIcon alt="Memphis function icon" height="15px" />}
<owner is="x3d">{selectedFunction?.owner === OWNER ? 'Memphis.dev' : selectedFunction?.owner}</owner>
{metaData?.owner === OWNER && <MemphisFunctionIcon alt="Memphis function icon" height="15px" />}
<owner is="x3d">{metaData?.owner === OWNER ? 'Memphis.dev' : metaData?.owner}</owner>
</div>
<Divider type="vertical" />
{selectedFunction?.owner === OWNER && (
{metaData?.owner === OWNER && (
<>
<downloads is="x3d">
<BiDownload className="download-icon" />
Expand All @@ -298,15 +298,15 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
)}
<commits is="x3d">
<FiGitCommit />
<OverflowTip text={parsingDate(selectedFunction?.installed_updated_at || metaData?.installed_updated_at, true, true)} width={'220px'}>
Last modified on {parsingDate(selectedFunction?.installed_updated_at || metaData?.installed_updated_at, true, true)}
<OverflowTip text={parsingDate(metaData?.installed_updated_at, true, true)} width={'220px'}>
Last modified on {parsingDate(metaData?.installed_updated_at, true, true)}
</OverflowTip>
</commits>
</deatils>
</div>
<description is="x3d">
<OverflowTip text={selectedFunction?.description} width={'520px'}>
{selectedFunction?.description}
<OverflowTip text={metaData?.description} width={'520px'}>
{metaData?.description}
</OverflowTip>
</description>
<actions is="x3d">
Expand All @@ -332,11 +332,11 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
fontSize="12px"
fontFamily="InterSemiBold"
onClick={() => (!isCloud() || state?.allowedActions?.can_apply_functions ? clickApply('attach') : setOpenUpgradeModal(true))}
disabled={selectedFunction?.installed_in_progress || !selectedFunction?.installed}
disabled={metaData?.installed_in_progress || !metaData?.installed}
/>
</div>
<div className="header-flex">
<Tooltip text={selectedFunction?.invalid_reason}>
<Tooltip text={metaData?.invalid_reason}>
<span>
<Button
placeholder={installBtnPlaceholder}
Expand All @@ -348,8 +348,8 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
fontSize="12px"
fontFamily="InterSemiBold"
onClick={handleInstallBtnClick}
isLoading={metaData?.installed_in_progress || selectedFunction?.installed_in_progress}
disabled={!selectedFunction?.is_valid || selectedFunction?.installed_in_progress}
isLoading={metaData?.installed_in_progress}
disabled={!metaData?.is_valid || metaData?.installed_in_progress}
/>
</span>
</Tooltip>
Expand All @@ -369,8 +369,8 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
fontFamily="InterSemiBold"
onClick={() =>
window.open(
`https://github.com/${selectedFunction?.owner}/${selectedFunction?.repo}/tree/${selectedFunction?.branch}/${
selectedFunction?.function_name || selectedFunction?.name
`https://github.com/${metaData?.owner}/${metaData?.repo}/tree/${metaData?.branch}/${
metaData?.function_name || metaData?.name
}`
)
}
Expand All @@ -387,7 +387,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
fontSize="12px"
fontFamily="InterSemiBold"
value={`Version: ${selectedVersion}`}
disabled={!selectedFunction?.installed}
disabled={!metaData?.installed}
onChange={(e) => {
setSelectedVersion(e);
}}
Expand All @@ -401,7 +401,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
<CustomTabs tabs={['Details', 'Code']} value={tabValue} onChange={(tabValue) => setTabValue(tabValue)} />
</div>
<TestMockEvent
functionDetails={selectedFunction}
functionDetails={metaData}
clickOutside={() => setIsTestFunctionModalOpen(false)}
open={isTestFunctionModalOpen}
selectedVersion={selectedVersion}
Expand Down Expand Up @@ -432,24 +432,24 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
<info is="x3d">
<repo is="x3d">
<GoRepo />
<label>{selectedFunction?.repo}</label>
<label>{metaData?.repo}</label>
</repo>
<branch is="x3d">
<GithubBranchIcon />
<label>{selectedFunction?.branch}</label>
<label>{metaData?.branch}</label>
</branch>
{selectedFunction?.is_valid && (
{metaData?.is_valid && (
<language is="x3d">
<CodeBlackIcon />
<label>{selectedFunction?.language}</label>
<label>{metaData?.language}</label>
</language>
)}
</info>
</deatils>
<Divider />
<label className="label-title">Social</label>
<deatils is="x3d">
{selectedFunction?.owner === OWNER && (
{metaData?.owner === OWNER && (
<>
<downloads is="x3d">
<BiDownload className="download-icon" />
Expand All @@ -465,21 +465,16 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
)}
<commits is="x3d">
<FiGitCommit />
<OverflowTip text={parsingDate(selectedFunction?.installed_updated_at || metaData?.installed_updated_at, true, true)} width={'210px'}>
Last modified on {parsingDate(selectedFunction?.installed_updated_at || metaData?.installed_updated_at, true, true)}
<OverflowTip text={parsingDate(metaData?.installed_updated_at, true, true)} width={'210px'}>
Last modified on {parsingDate(metaData?.installed_updated_at, true, true)}
</OverflowTip>
</commits>
</deatils>
<Divider />
{selectedFunction?.is_valid && (
{metaData?.is_valid && (
<>
<label className="label-title">Tags</label>
<TagsList
tagsToShow={3}
tags={selectedFunction?.tags}
entityType="function"
entityName={selectedFunction?.function_name || selectedFunction?.name}
/>
<TagsList tagsToShow={3} tags={metaData?.tags} entityType="function" entityName={metaData?.function_name || metaData?.name} />
<Divider />
</>
)}
Expand Down Expand Up @@ -519,7 +514,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
</div>
<div className="code-content-section">
<>
{!selectedFunction?.installed ? (
{!metaData?.installed ? (
<Tooltip text="Install the function to enable test">
<span>
<Button
Expand All @@ -531,7 +526,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
fontSize="12px"
fontFamily="InterSemiBold"
onClick={() => setIsTestFunctionModalOpen(true)}
disabled={!selectedFunction?.installed}
disabled={!metaData?.installed}
/>
</span>
</Tooltip>
Expand All @@ -545,7 +540,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
fontSize="12px"
fontFamily="InterSemiBold"
onClick={() => setIsTestFunctionModalOpen(true)}
disabled={!selectedFunction?.installed || selectedFunction?.installed_in_progress}
disabled={!metaData?.installed || metaData?.installed_in_progress}
/>
)}
<div className="code-content">
Expand Down
5 changes: 3 additions & 2 deletions ui_src/src/domain/stationOverview/stationObservabilty/components/functionCard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import Tooltip from '../../../../../components/tooltip/tooltip';

export default function FunctionCard({
onClick,
onClickMenu,
stationName,
partiotionNumber,
onDeleteFunction,
functionItem,
isGeneralView,
isDeactive = false,
selected,
changeActivition
Expand Down Expand Up @@ -190,8 +190,9 @@ export default function FunctionCard({
placement="bottom"
content={functionContextMenu}
trigger="click"
onOpenChange={() => {
onOpenChange={(e) => {
setPopoverFunctionContextMenu(!popoverFunctionContextMenu);
e && onClickMenu();
}}
open={popoverFunctionContextMenu}
>
Expand Down
1 change: 1 addition & 0 deletions ui_src/src/domain/stationOverview/stationObservabilty/components/functionsOverview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ const FunctionsOverview = ({ referredFunction, dismissFunction, moveToGenralView
setCurrentFunction(functionItem);
setOpenBottomDetails(true);
}}
onClickMenu={() => setCurrentFunction(functionItem)}
updatedFunctionList={(data) => stationDispatch({ type: 'UPDATE_FUNCTION_LIST', payload: data?.functions['1'] })}
key={`${functionItem?.id}-${index}`}
changeActivition={(e) => changeActivition(functionItem?.id, e)}
Expand Down
4 changes: 2 additions & 2 deletions ui_static_files/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.6b25ff02.css",
"main.js": "/static/js/main.6f0e89fa.js",
"main.js": "/static/js/main.d54b192f.js",
"static/js/617.a5f8c4fc.chunk.js": "/static/js/617.a5f8c4fc.chunk.js",
"static/js/2542.27de8743.chunk.js": "/static/js/2542.27de8743.chunk.js",
"static/js/1737.e134cfd4.chunk.js": "/static/js/1737.e134cfd4.chunk.js",
Expand Down Expand Up @@ -317,6 +317,6 @@
},
"entrypoints": [
"static/css/main.6b25ff02.css",
"static/js/main.6f0e89fa.js"
"static/js/main.d54b192f.js"
]
}
Loading