From 98fbff01163d5ef1fde9e32d32ac8c599c789cab Mon Sep 17 00:00:00 2001 From: Gabriel Dutra Date: Sun, 29 Mar 2020 12:51:45 -0300 Subject: [PATCH 1/3] Show Query Publish Button on Mobile --- client/app/pages/queries/components/QueryPageHeader.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/pages/queries/components/QueryPageHeader.jsx b/client/app/pages/queries/components/QueryPageHeader.jsx index 757da613ac..c993033194 100644 --- a/client/app/pages/queries/components/QueryPageHeader.jsx +++ b/client/app/pages/queries/components/QueryPageHeader.jsx @@ -158,7 +158,7 @@ export default function QueryPageHeader({
{headerExtra} {queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit && ( - )} From 5388a4b914b2f5cc8ef3ef109d572cd22bf421cc Mon Sep 17 00:00:00 2001 From: Gabriel Dutra Date: Sun, 29 Mar 2020 13:06:19 -0300 Subject: [PATCH 2/3] Move publish option to the dropdown on mobile --- .../queries/components/QueryPageHeader.jsx | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/client/app/pages/queries/components/QueryPageHeader.jsx b/client/app/pages/queries/components/QueryPageHeader.jsx index c993033194..9d0a755bd4 100644 --- a/client/app/pages/queries/components/QueryPageHeader.jsx +++ b/client/app/pages/queries/components/QueryPageHeader.jsx @@ -5,6 +5,7 @@ import Button from "antd/lib/button"; import Dropdown from "antd/lib/dropdown"; import Menu from "antd/lib/menu"; import Icon from "antd/lib/icon"; +import useMedia from "use-media"; import EditInPlace from "@/components/EditInPlace"; import FavoritesControl from "@/components/FavoritesControl"; import { QueryTagsControl } from "@/components/tags-control/TagsControl"; @@ -68,8 +69,8 @@ export default function QueryPageHeader({ headerExtra, tagsExtra, onChange, - onRefresh, }) { + const isMobile = !useMedia({ minWidth: 768 }); const queryFlags = useQueryFlags(query, dataSource); const updateName = useRenameQuery(query, onChange); const updateTags = useUpdateQueryTags(query, onChange); @@ -107,6 +108,12 @@ export default function QueryPageHeader({ title: "Manage Permissions", onClick: openPermissionsEditorDialog, }, + publish: { + isAvailable: + isMobile && queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit, + title: "Publish", + onClick: publishQuery, + }, unpublish: { isAvailable: !queryFlags.isNew && queryFlags.canEdit && !queryFlags.isDraft, title: "Unpublish", @@ -122,13 +129,19 @@ export default function QueryPageHeader({ }, ]), [ - queryFlags, + queryFlags.isNew, + queryFlags.canFork, + queryFlags.canEdit, + queryFlags.isArchived, + queryFlags.isDraft, + isDuplicating, + duplicateQuery, archiveQuery, + openPermissionsEditorDialog, + isMobile, + publishQuery, unpublishQuery, openApiKeyDialog, - openPermissionsEditorDialog, - isDuplicating, - duplicateQuery, ] ); @@ -157,7 +170,7 @@ export default function QueryPageHeader({
{headerExtra} - {queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit && ( + {!isMobile && queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit && ( From c28ea1d3c4c0c84c381029c06764d7b11ade0b6c Mon Sep 17 00:00:00 2001 From: Gabriel Dutra Date: Mon, 30 Mar 2020 12:36:09 -0300 Subject: [PATCH 3/3] isMobile -> isDesktop --- client/app/pages/queries/components/QueryPageHeader.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/app/pages/queries/components/QueryPageHeader.jsx b/client/app/pages/queries/components/QueryPageHeader.jsx index 9d0a755bd4..50e022a886 100644 --- a/client/app/pages/queries/components/QueryPageHeader.jsx +++ b/client/app/pages/queries/components/QueryPageHeader.jsx @@ -70,7 +70,7 @@ export default function QueryPageHeader({ tagsExtra, onChange, }) { - const isMobile = !useMedia({ minWidth: 768 }); + const isDesktop = useMedia({ minWidth: 768 }); const queryFlags = useQueryFlags(query, dataSource); const updateName = useRenameQuery(query, onChange); const updateTags = useUpdateQueryTags(query, onChange); @@ -110,7 +110,7 @@ export default function QueryPageHeader({ }, publish: { isAvailable: - isMobile && queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit, + !isDesktop && queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit, title: "Publish", onClick: publishQuery, }, @@ -138,7 +138,7 @@ export default function QueryPageHeader({ duplicateQuery, archiveQuery, openPermissionsEditorDialog, - isMobile, + isDesktop, publishQuery, unpublishQuery, openApiKeyDialog, @@ -170,7 +170,7 @@ export default function QueryPageHeader({
{headerExtra} - {!isMobile && queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit && ( + {isDesktop && queryFlags.isDraft && !queryFlags.isArchived && !queryFlags.isNew && queryFlags.canEdit && (