Minor sync for 2.0
This commit is contained in:
@@ -96,7 +96,7 @@ const AdminNavBar = (props) => {
|
|||||||
return (
|
return (
|
||||||
<Wrapper>
|
<Wrapper>
|
||||||
<div style={{ flexDirection: 'column', width: 220, }}>
|
<div style={{ flexDirection: 'column', width: 220, }}>
|
||||||
<nav style={{ padding: '25px 25px 3px 25px', height: "calc(100% - 30px)", fontSize: '16px', borderTopLeftRadius: 8, borderBottomLeftRadius: 8, background: '#212121', color: '#9CA3AF' }}>
|
<nav style={{ padding: '25px 25px 3px 25px', height: isCloud ? "calc(100% - 60px)" : "calc(100% - 30px)" , fontSize: '16px', borderTopLeftRadius: 8, borderBottomLeftRadius: 8, background: '#212121', color: '#9CA3AF' }}>
|
||||||
<div style={{ display: 'flex', alignItems: 'center', }}>
|
<div style={{ display: 'flex', alignItems: 'center', }}>
|
||||||
<img loading="lazy" src={imageData} alt="Logo" style={{ width: '30px', borderRadius: 8, height: '30px', marginRight: '8px' }} />
|
<img loading="lazy" src={imageData} alt="Logo" style={{ width: '30px', borderRadius: 8, height: '30px', marginRight: '8px' }} />
|
||||||
<div style={{
|
<div style={{
|
||||||
|
|||||||
@@ -525,7 +525,7 @@ useEffect(() => {
|
|||||||
<Divider style={{ marginBottom: 10, }} />
|
<Divider style={{ marginBottom: 10, }} />
|
||||||
|
|
||||||
<Typography color="textSecondary" align="center" style={{ marginTop: 5, marginBottom: 5, fontSize: 18 }}>
|
<Typography color="textSecondary" align="center" style={{ marginTop: 5, marginBottom: 5, fontSize: 18 }}>
|
||||||
Version: 2.0.0-rc7
|
Version: 2.0.0
|
||||||
</Typography>
|
</Typography>
|
||||||
</Menu>
|
</Menu>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -1687,7 +1687,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
if (filter === undefined || filter === null || filter.toUpperCase() === "ALL") {
|
if (filter === undefined || filter === null || filter.toUpperCase() === "ALL") {
|
||||||
|
|
||||||
// Check for
|
// Check for
|
||||||
if (executionFilter !== undefined && executionFilter !== null && executionFilter.length > 0) {
|
if (executionFilter !== undefined && executionFilter !== null && executionFilter.length > 0 && filter !== "ALL") {
|
||||||
filter = executionFilter
|
filter = executionFilter
|
||||||
} else {
|
} else {
|
||||||
filter = "ALL"
|
filter = "ALL"
|
||||||
|
|||||||
@@ -2906,7 +2906,7 @@ const AppExplorer = (props) => {
|
|||||||
const deduplicateByName = (array) => {
|
const deduplicateByName = (array) => {
|
||||||
const uniqueNames = {};
|
const uniqueNames = {};
|
||||||
return array.filter(item => {
|
return array.filter(item => {
|
||||||
if (!item.hasOwnProperty('name') || !item.name.length) {
|
if (!item?.hasOwnProperty('name') || !item?.name?.length) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
if (!uniqueNames[item.name]) {
|
if (!uniqueNames[item.name]) {
|
||||||
|
|||||||
Reference in New Issue
Block a user