Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "Feature/launch btn fusion"

Browse Source 
This reverts commit d9830d1eabb42c60daf064751e7b0e9f273ca0f1.
This commit is contained in:
Hetu Nandu 2020-04-09 15:36:52 +05:30
parent 832380b226
commit 9d70b24c0e
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/cypress/locators/HomePage.json
View File

@ -1,6 +1,6 @@
{ {
"searchInput": "input[type='text']", "searchInput": "input[type='text']",
"appEditIcon": "span[icon='edit']", "appEditIcon": ".t--application-edit-link",
"publishButton":".t--application-publish-btn", "publishButton":".t--application-publish-btn",
"publishCrossButton":"span[icon='small-cross']", "publishCrossButton":"span[icon='small-cross']",
"homePageID":"//div[@id='root']" "homePageID":"//div[@id='root']"

38
app/client/src/pages/Applications/ApplicationCard.tsx
View File

@ -5,7 +5,7 @@ import {
getApplicationViewerPageURL, getApplicationViewerPageURL,
BUILDER_PAGE_URL, BUILDER_PAGE_URL,
} from "constants/routes"; } from "constants/routes";
import { Card, Tooltip, Classes, Icon } from "@blueprintjs/core"; import { Card, Tooltip, Classes } from "@blueprintjs/core";
import { ApplicationPayload } from "constants/ReduxActionConstants"; import { ApplicationPayload } from "constants/ReduxActionConstants";
import Button from "components/editorComponents/Button"; import Button from "components/editorComponents/Button";
import { import {
@ -13,10 +13,10 @@ import {
getBorderCSSShorthand, getBorderCSSShorthand,
getColorWithOpacity, getColorWithOpacity,
} from "constants/DefaultTheme"; } from "constants/DefaultTheme";
import { ControlIcons } from "icons/ControlIcons";
import ContextDropdown, { import ContextDropdown, {
ContextDropdownOption, ContextDropdownOption,
} from "components/editorComponents/ContextDropdown"; } from "components/editorComponents/ContextDropdown";
import { Colors } from "constants/Colors";
const Wrapper = styled(Card)` const Wrapper = styled(Card)`
display: flex; display: flex;
@ -74,18 +74,9 @@ const ApplicationTitle = styled.div`
border-top: ${props => getBorderCSSShorthand(props.theme.card.divider)}; border-top: ${props => getBorderCSSShorthand(props.theme.card.divider)};
font-weight: ${props => props.theme.fontWeights[2]}; font-weight: ${props => props.theme.fontWeights[2]};
font-size: ${props => props.theme.fontSizes[4]}px; font-size: ${props => props.theme.fontSizes[4]}px;
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
& { & {
& > { span {
span:first-of-type { display: inline-block;
display: inline-block;
width: 80%;
text-overflow: ellipsis;
overflow: hidden;
}
} }
.control { .control {
z-index: 1; z-index: 1;
@ -131,8 +122,13 @@ const Control = styled.button<{ fixed?: boolean }>`
`; `;
const APPLICATION_CONTROL_FONTSIZE_INDEX = 6; const APPLICATION_CONTROL_FONTSIZE_INDEX = 6;
const ViewIcon = ControlIcons.VIEW_CONTROL;
const editControl = <Icon icon="edit" color={Colors.HIT_GRAY} />; const viewIconProps = {
width: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX - 1],
height: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX - 1],
color: theme.colors.secondary,
};
const viewControlIcon = <ViewIcon {...viewIconProps} />;
type ApplicationCardProps = { type ApplicationCardProps = {
application: ApplicationPayload; application: ApplicationPayload;
@ -190,10 +186,10 @@ export const ApplicationCard = (props: ApplicationCardProps) => {
className={props.loading ? Classes.SKELETON : undefined} className={props.loading ? Classes.SKELETON : undefined}
> >
<span>{props.application.name}</span> <span>{props.application.name}</span>
<Link className="t--application-edit-link" to={editApplicationURL}> <Link to={viewApplicationURL}>
<Control className="control"> <Control className="control">
<Tooltip content="Edit" hoverOpenDelay={500}> <Tooltip content="Launch App" hoverOpenDelay={500}>
{editControl} {viewControlIcon}
</Tooltip> </Tooltip>
</Control> </Control>
</Link> </Link>
@ -207,14 +203,14 @@ export const ApplicationCard = (props: ApplicationCardProps) => {
className="more" className="more"
/> />
</ApplicationTitle> </ApplicationTitle>
<Link className="t--application-view-link" to={viewApplicationURL}> <Link className="t--application-edit-link" to={editApplicationURL}>
<ApplicationImage className="image-container"> <ApplicationImage className="image-container">
<Control className="control"> <Control className="control">
<Button <Button
filled filled
text="Launch" text="Edit"
intent="primary" intent="primary"
icon="play" icon="edit"
iconAlignment="left" iconAlignment="left"
size="small" size="small"
className="t--application-edit-btn" className="t--application-edit-btn"