Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
  • Loading branch information
svetaStrech committed Nov 23, 2023
1 parent 74d469d commit 93f73f7
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 28 deletions.
1 change: 0 additions & 1 deletion ui_src/src/components/sideBar/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@
display: flex;
align-items: center;
justify-content: space-between;
width: 240px;
.MuiSvgIcon-root {
height: 20px;
display: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ const GitHubIntegration = ({ close, value }) => {
{formFields?.keys?.connected_repos?.map((repo, index) => {
return (
<IntegrationItem
key={index}
key={`${repo.repo_name}_${repo.branch}_${repo.repo_owner}`}
index={index}
repo={repo}
reposList={repos || []}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ const IntegrationItem = ({ isNew, index, disabled, repo, reposList, updateIntegr
const [isEditting, setIsEditting] = useState(false);
const [formFields, setFormFields] = useState({
type: 'functions',
repo_name: '',
repo_owner: '',
branch: ''
repo_name: null,
repo_owner: null,
branch: null
});
const [branches, setBranches] = useState([]);

useEffect(() => {
repo.repo_name && repo.repo_owner && getSourceCodeBranches(repo.repo_name, repo.repo_owner);
setFormFields({ repo_name: repo.repo_name, repo_owner: repo.repo_owner, branch: repo.branch, type: 'functions' });
}, []);
}, [repo]);

useEffect(() => {
branches?.length > 0 && isEditting && updateBranch(branches[0]);
}, [branches]);

useEffect(() => {
updateIntegrationList(formFields, index);
formFields.branch && updateIntegrationList(formFields, index);
}, [formFields.branch]);

useEffect(() => {
Expand Down
6 changes: 3 additions & 3 deletions ui_src/src/domain/functions/components/functionBox/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function FunctionBox({ funcDetails, integrated, isTagsOn = true, onClick = null,
)}
<commits is="x3d">
<FiGitCommit />
<label>Last commit on {parsingDate(functionDetails?.installed_updated_at, true, true)}</label>
<label>Last modified on {parsingDate(functionDetails?.installed_updated_at, true, true)}</label>
</commits>
</deatils>
<description is="x3d">
Expand All @@ -185,8 +185,8 @@ function FunctionBox({ funcDetails, integrated, isTagsOn = true, onClick = null,
<div onClick={(e) => e.stopPropagation()} className="install-button">
{!isValid && (
<div className="warning">
<IoIosInformationCircle style={{ fontSize: '20px', color: '#6557FF' }} />
<OverflowTip text={functionDetails?.invalid_reason} maxWidth={'260px'}>
<IoIosInformationCircle style={{ fontSize: '20px', color: '#fc3400' }} />
<OverflowTip text={functionDetails?.invalid_reason} maxWidth={'260px'} textColor="#fc3400">
<label className="warning-message">{functionDetails?.invalid_reason}</label>
</OverflowTip>
</div>
Expand Down
5 changes: 2 additions & 3 deletions ui_src/src/domain/functions/components/functionBox/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,10 @@
justify-content: center;
align-items: center;
border-radius: 32px;
border: 1px solid #dddbff;
background: #ecebff;
background: rgba(252, 52, 0, 0.1);
gap: 5px;
.warning-message {
color: #2e2c34;
color: #fc3400;
font-family: 'InterSemiBold';
font-size: 12px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
)}
<commits is="x3d">
<FiGitCommit />
<label>Last commit on {parsingDate(selectedFunction?.installed_updated_at, false, false)}</label>
<label>Last modified on {parsingDate(selectedFunction?.installed_updated_at, false, false)}</label>
</commits>
</deatils>
</div>
Expand Down Expand Up @@ -274,7 +274,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
<div className="header-flex">
<Button
placeholder={
selectedFunction?.installed_in_progress ? (
metaData?.installed_in_progress ? (
''
) : selectedFunction?.installed ? (
<div className="code-btn">
Expand All @@ -296,7 +296,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
fontSize="12px"
fontFamily="InterSemiBold"
onClick={() => (selectedFunction?.installed ? handleUnInstall() : handleInstall())}
isLoading={selectedFunction?.installed_in_progress}
isLoading={metaData?.installed_in_progress}
disabled={!selectedFunction?.is_valid || selectedFunction?.installed_in_progress}
/>
</div>
Expand Down Expand Up @@ -408,7 +408,7 @@ function FunctionDetails({ selectedFunction, handleInstall, handleUnInstall, cli
)}
<commits is="x3d">
<FiGitCommit />
<label>Last commit on {parsingDate(selectedFunction?.installed_updated_at, false, false)}</label>
<label>Last modified on {parsingDate(selectedFunction?.installed_updated_at, false, false)}</label>
</commits>
</deatils>
<Divider />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function FunctionList({ tabPrivate }) {
</OverflowTip>
<OverflowTip text={`${repo?.branch} | ${parsingDate(repo?.last_modified, true, true)}`} width={'170px'} center={false}>
<label className="last-modified">
{repo?.branch} | Synced on {parsingDate(repo?.last_modified, true, true)}
{repo?.branch} | Last modified {parsingDate(repo?.last_modified, true, true)}
</label>
</OverflowTip>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
connectedRepos {
display: flex;
width: 240px;
width: 245px;
height: 34px;
padding: 5px 10px;
justify-content: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
border-radius: 8px;
width: 100%;
height: calc(100% - 50px);
max-height: 500px;
max-height: 470px;
overflow-y: auto;
margin-top: 5px;
.header {
Expand Down
8 changes: 4 additions & 4 deletions ui_static_files/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.1ef3db66.css",
"main.js": "/static/js/main.6031a4a1.js",
"main.css": "/static/css/main.c73ae7d6.css",
"main.js": "/static/js/main.37bbc7f1.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 @@ -316,7 +316,7 @@
"static/media/closeNotification.svg": "/static/media/closeNotification.7551e8366682f9c6585bb1a694c4112a.svg"
},
"entrypoints": [
"static/css/main.1ef3db66.css",
"static/js/main.6031a4a1.js"
"static/css/main.c73ae7d6.css",
"static/js/main.37bbc7f1.js"
]
}
2 changes: 1 addition & 1 deletion ui_static_files/build/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.6031a4a1.js"></script><link href="/static/css/main.1ef3db66.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.37bbc7f1.js"></script><link href="/static/css/main.c73ae7d6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 93f73f7

Please sign in to comment.