Skip to content

Commit

Permalink
Merge pull request #1784 from makeplane/stage-release
Browse files Browse the repository at this point in the history
promote: stage-release to master v0.10.1-patch
  • Loading branch information
vamsi authored Aug 3, 2023
2 parents 3488001 + 9b4aebc commit 9ff8994
Show file tree
Hide file tree
Showing 35 changed files with 738 additions and 785 deletions.
2 changes: 1 addition & 1 deletion apiserver/plane/api/views/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def post(self, request, slug, project_id, service):
# if there is no default state assign any random state
if default_state is None:
default_state = State.objects.filter(
~Q(name="Triage"), sproject_id=project_id
~Q(name="Triage"), project_id=project_id
).first()

# Get the maximum sequence_id
Expand Down
7 changes: 7 additions & 0 deletions apiserver/plane/api/views/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
Label,
WorkspaceMember,
CycleIssue,
IssueReaction,
)
from plane.api.permissions import (
WorkSpaceBasePermission,
Expand Down Expand Up @@ -1321,6 +1322,12 @@ def get(self, request, slug, user_id):
)
.select_related("project", "workspace", "state", "parent")
.prefetch_related("assignees", "labels")
.prefetch_related(
Prefetch(
"issue_reactions",
queryset=IssueReaction.objects.select_related("actor"),
)
)
.order_by("-created_at")
.annotate(
link_count=IssueLink.objects.filter(issue=OuterRef("id"))
Expand Down
38 changes: 33 additions & 5 deletions apps/app/components/command-palette/change-interface-theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,59 @@ import { Command } from "cmdk";
import { THEMES_OBJ } from "constants/themes";
import { useTheme } from "next-themes";
import { SettingIcon } from "components/icons";
import userService from "services/user.service";
import useUser from "hooks/use-user";

type Props = {
setIsPaletteOpen: Dispatch<SetStateAction<boolean>>;
};

export const ChangeInterfaceTheme: React.FC<Props> = ({ setIsPaletteOpen }) => {
const [mounted, setMounted] = useState(false);

const { setTheme } = useTheme();

const { user, mutateUser } = useUser();

const updateUserTheme = (newTheme: string) => {
if (!user) return;

setTheme(newTheme);

mutateUser((prevData) => {
if (!prevData) return prevData;

return {
...prevData,
theme: {
...prevData.theme,
theme: newTheme,
},
};
}, false);

userService.updateUser({
theme: {
...user.theme,
theme: newTheme,
},
});
};

// useEffect only runs on the client, so now we can safely show the UI
useEffect(() => {
setMounted(true);
}, []);

if (!mounted) {
return null;
}
if (!mounted) return null;

return (
<>
{THEMES_OBJ.map((theme) => (
{THEMES_OBJ.filter((t) => t.value !== "custom").map((theme) => (
<Command.Item
key={theme.value}
onSelect={() => {
setTheme(theme.value);
updateUserTheme(theme.value);
setIsPaletteOpen(false);
}}
className="focus:outline-none"
Expand Down
Loading

1 comment on commit 9ff8994

@vercel
Copy link

@vercel vercel bot commented on 9ff8994 Aug 3, 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 – ./apps/app

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

Please sign in to comment.