Skip to content

Add tooltip for Publish button #30

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

Merged
merged 1 commit into from
Sep 8, 2023
Merged

Add tooltip for Publish button #30

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
9 changes: 8 additions & 1 deletion apps/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ class Meta:
last_modified_by_email = serializers.SerializerMethodField()
template = serializers.SerializerMethodField()
visibility = serializers.SerializerMethodField()
has_live_version = serializers.SerializerMethodField()

def get_logo(self, obj):
profile = Profile.objects.get(user=obj.owner)
Expand Down Expand Up @@ -142,6 +143,12 @@ def get_data(self, obj):
if app_data:
return app_data.data
return None

def get_has_live_version(self, obj):
app_datas = AppData.objects.filter(
app_uuid=obj.uuid, is_draft=False).first()
return app_datas is not None


def get_app_type_name(self, obj):
return obj.type.name
Expand Down Expand Up @@ -237,7 +244,7 @@ class Meta:
'logo', 'is_shareable', 'has_footer', 'domain', 'visibility', 'accessible_by',
'access_permission', 'last_modified_by_email', 'owner_email', 'web_config',
'slack_config', 'discord_config', 'app_type_name', 'processors', 'template',
'read_accessible_by', 'write_accessible_by'
'read_accessible_by', 'write_accessible_by', 'has_live_version'
]


Expand Down
54 changes: 36 additions & 18 deletions client/src/pages/AppEdit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
Paper,
Stack,
SvgIcon,
Tooltip,
} from "@mui/material";
import ChangeHistoryIcon from "@mui/icons-material/ChangeHistory";
import EditIcon from "@mui/icons-material/Edit";
Expand Down Expand Up @@ -401,27 +402,44 @@ export default function AppEditPage(props) {
app={app}
setIsPublished={setIsPublished}
/>

{appId && app && (
<Button
variant="contained"
color="success"
style={{ textTransform: "none" }}
disabled={app.owner_email !== profile.user_email}
startIcon={
isPublished ? (
<UnpublishedIcon />
) : (
<PublishedWithChangesIcon />
)
}
onClick={() =>
isPublished
? setShowUnpublishModal(true)
: setShowPublishModal(true)
<Tooltip
arrow={true}
title={
app?.has_live_version
? isPublished
? "Unpublish App"
: "Publish App"
: "Please save App before publishing"
}
>
{isPublished ? "Unpublish" : "Publish"}
</Button>
<span>
<Button
variant="contained"
color="success"
style={{ textTransform: "none" }}
disabled={
app.owner_email !== profile.user_email ||
!app?.has_live_version
}
startIcon={
isPublished ? (
<UnpublishedIcon />
) : (
<PublishedWithChangesIcon />
)
}
onClick={() =>
isPublished
? setShowUnpublishModal(true)
: setShowPublishModal(true)
}
>
{isPublished ? "Unpublish" : "Publish"}
</Button>
</span>
</Tooltip>
)}
</Stack>
</Stack>
Expand Down