Skip to content

Commit

Permalink
Merge pull request #2319 from makeplane/stage-release
Browse files Browse the repository at this point in the history
release: stage release to master
  • Loading branch information
sriramveeraghanta authored Sep 29, 2023
2 parents f751619 + 25a973a commit 3ff47b3
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/Update_Docker_Images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
type=ref,event=tag
- name: Extract metadata (tags, labels) for Docker (Docker Hub) from Github Release
id: metaDeploy
id: metaSpace
uses: docker/[email protected]
with:
images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-deploy
images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space
tags: |
type=ref,event=tag
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
file: ./space/Dockerfile.space
platforms: linux/amd64
push: true
tags: ${{ steps.metaDeploy.outputs.tags }}
tags: ${{ steps.metaSpace.outputs.tags }}
env:
DOCKER_BUILDKIT: 1
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,10 @@ export const SpreadsheetView: React.FC<Props> = ({
<>
<div className="sticky left-0 w-[28rem] z-[2]">
<div
className={`relative flex flex-col h-max w-full bg-custom-background-100 z-[2] ${
isScrolled ? "shadow-r shadow-custom-shadow-xs" : ""
}`}
className="relative flex flex-col h-max w-full bg-custom-background-100 z-[2]"
style={{
boxShadow: isScrolled ? "8px -9px 12px rgba(0, 0, 0, 0.15)" : "",
}}
>
<div className="flex items-center text-sm font-medium z-[2] h-11 w-full sticky top-0 bg-custom-background-90 border border-l-0 border-custom-border-100">
{currentViewProperties.key && (
Expand Down
49 changes: 48 additions & 1 deletion web/components/issues/modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view";
import useProjects from "hooks/use-projects";
import useMyIssues from "hooks/my-issues/use-my-issues";
import useLocalStorage from "hooks/use-local-storage";
import { useWorkspaceView } from "hooks/use-workspace-view";
// components
import { IssueForm, ConfirmIssueDiscard } from "components/issues";
// types
Expand All @@ -37,6 +38,7 @@ import {
VIEW_ISSUES,
INBOX_ISSUES,
PROJECT_DRAFT_ISSUES_LIST_WITH_PARAMS,
WORKSPACE_VIEW_ISSUES,
} from "constants/fetch-keys";
// constants
import { INBOX_ISSUE_SOURCE } from "constants/inbox";
Expand Down Expand Up @@ -81,7 +83,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
const [prePopulateData, setPreloadedData] = useState<Partial<IIssue>>({});

const router = useRouter();
const { workspaceSlug, projectId, cycleId, moduleId, viewId, inboxId } = router.query;
const { workspaceSlug, projectId, cycleId, moduleId, viewId, globalViewId, inboxId } =
router.query;

const { displayFilters, params } = useIssuesView();
const { params: calendarParams } = useCalendarIssuesView();
Expand All @@ -94,6 +97,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({

const { groupedIssues, mutateMyIssues } = useMyIssues(workspaceSlug?.toString());

const { params: globalViewParams } = useWorkspaceView();

const { setValue: setValueInLocalStorage, clearValue: clearLocalStorageValue } =
useLocalStorage<any>("draftedIssue", {});

Expand Down Expand Up @@ -276,6 +281,40 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
});
};

const workspaceIssuesPath = [
{
params: {
sub_issue: false,
},
path: "workspace-views/all-issues",
},
{
params: {
assignees: user?.id ?? undefined,
sub_issue: false,
},
path: "workspace-views/assigned",
},
{
params: {
created_by: user?.id ?? undefined,
sub_issue: false,
},
path: "workspace-views/created",
},
{
params: {
subscriber: user?.id ?? undefined,
sub_issue: false,
},
path: "workspace-views/subscribed",
},
];

const currentWorkspaceIssuePath = workspaceIssuesPath.find((path) =>
router.pathname.includes(path.path)
);

const calendarFetchKey = cycleId
? CYCLE_ISSUES_WITH_PARAMS(cycleId.toString(), calendarParams)
: moduleId
Expand Down Expand Up @@ -332,6 +371,14 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
mutate(USER_ISSUE(workspaceSlug as string));

if (payload.parent && payload.parent !== "") mutate(SUB_ISSUES(payload.parent));

if (globalViewId)
mutate(WORKSPACE_VIEW_ISSUES(globalViewId.toString(), globalViewParams));

if (currentWorkspaceIssuePath)
mutate(
WORKSPACE_VIEW_ISSUES(workspaceSlug.toString(), currentWorkspaceIssuePath?.params)
);
})
.catch(() => {
setToastAlert({
Expand Down
2 changes: 1 addition & 1 deletion web/components/workspace/views/modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const CreateUpdateWorkspaceViewModal: React.FC<Props> = ({
mutate(WORKSPACE_VIEWS_LIST(workspaceSlug as string));
handleClose();

router.replace(`/${workspaceSlug}/workspace-views/issues?viewId=${res.id}`);
router.replace(`/${workspaceSlug}/workspace-views/issues?globalViewId=${res.id}`);

setToastAlert({
type: "success",
Expand Down

2 comments on commit 3ff47b3

@vercel
Copy link

@vercel vercel bot commented on 3ff47b3 Sep 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

plane-sh – ./space/

plane-sh-git-master-plane.vercel.app
plane-deploy.vercel.app
plane-sh-plane.vercel.app
plane.sh

@vercel
Copy link

@vercel vercel bot commented on 3ff47b3 Sep 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

plane – ./web/

plane-theta.vercel.app
app.plane.so
plane-plane.vercel.app
plane-git-master-plane.vercel.app

Please sign in to comment.