Skip to content

Commit

Permalink
chore: ticket ui cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@potts99
potts99 committed Jun 8, 2024
1 parent 8b94705 commit 949f914
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 76 deletions.
Binary file modified .yarn/install-state.gz
View file
Binary file not shown.
30 changes: 17 additions & 13 deletions apps/client/components/Combo/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type Status = {
icon: LucideIcon;
};

export function UserCombo({ value, update, defaultName }) {
export function UserCombo({ value, update, defaultName, hideInitial, Icon }) {
const [open, setOpen] = React.useState(false);
const [selectedStatus, setSelectedStatus] = React.useState<any | null>(null);

Expand All @@ -41,25 +41,29 @@ export function UserCombo({ value, update, defaultName }) {
>
{selectedStatus ? (
<div className="flex flex-row space-x-4 w-[120px]">
<div className="flex-shrink-0">
<span className="inline-flex h-5 w-5 items-center justify-center rounded-full bg-gray-500">
<span className="text-xs font-medium leading-none text-white uppercase ">
{selectedStatus.name[0]}
{!hideInitial && (
<div className="flex-shrink-0">
<span className="inline-flex h-5 w-5 items-center justify-center rounded-full bg-gray-500">
<span className="text-xs font-medium leading-none text-white uppercase ">
{selectedStatus.name[0]}
</span>
</span>
</span>
</div>
</div>
)}
{selectedStatus.name}
</div>
) : defaultName ? (
<>
<div className="flex flex-row space-x-2">
<div className="flex-shrink-0">
<span className="inline-flex h-5 w-5 items-center justify-center rounded-full bg-gray-500">
<span className="text-xs font-medium leading-none text-white uppercase ">
{defaultName[0]}
{!hideInitial && (
<div className="flex-shrink-0">
<span className="inline-flex h-5 w-5 items-center justify-center rounded-full bg-gray-500">
<span className="text-xs font-medium leading-none text-white uppercase ">
{defaultName[0]}
</span>
</span>
</span>
</div>
</div>
)}
<span>{defaultName}</span>
</div>
</>
Expand Down
10 changes: 8 additions & 2 deletions apps/client/components/TicketDetails/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ export default function Ticket() {
detail: JSON.stringify(debouncedValue),
note,
title,
priority,
status: ticketStatus,
priority: priority ? priority.value : undefined,
status: ticketStatus ? ticketStatus.value : undefined,
}),
})
.then((res) => res.json())
Expand Down Expand Up @@ -314,6 +314,10 @@ export default function Ticket() {
transferTicket();
}, [n]);

useEffect(() => {
update();
}, [priority, ticketStatus]);

const [debouncedValue] = useDebounce(issue, 500);

useEffect(() => {
Expand Down Expand Up @@ -765,11 +769,13 @@ export default function Ticket() {
value={priorityOptions}
update={setPriority}
defaultName={data.ticket.priority ? data.ticket.priority : ""}
hideInitial={true}
/>
<UserCombo
value={ticketStatusMap}
update={setTicketStatus}
defaultName={data.ticket.status ? data.ticket.status : ""}
hideInitial={true}
/>

{/* <div className="border-t border-gray-200">
Expand Down
81 changes: 20 additions & 61 deletions apps/client/layouts/newLayout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ export default function NewLayout({ children }: any) {
const locale = user ? user.language : "en";

const [queues, setQueues] = useState([]);
const [keypressdown, setKeyPressDown] = useState(false)
const [keypressdown, setKeyPressDown] = useState(false);

const { t, lang } = useTranslation("peppermint");

Expand Down Expand Up @@ -432,7 +432,7 @@ export default function NewLayout({ children }: any) {
) {
switch (event.key) {
case "c":
setKeyPressDown(true)
setKeyPressDown(true);
break;
case "h":
location.push("/");
Expand Down Expand Up @@ -759,7 +759,10 @@ export default function NewLayout({ children }: any) {
<ul role="list" className="flex flex-1 flex-col gap-y-7 w-full">
<li>
<ul role="list" className="-mx-2 space-y-1 w-full">
<CreateTicketModal keypress={keypressdown} setKeyPressDown={setKeyPressDown} />
<CreateTicketModal
keypress={keypressdown}
setKeyPressDown={setKeyPressDown}
/>
{navigation.map((item: any) => (
<li key={item.name}>
<Link
Expand Down Expand Up @@ -857,64 +860,20 @@ export default function NewLayout({ children }: any) {
"group -mx-2 flex gap-x-3 p-1 rounded-md text-xs font-semibold leading-6"
)}
>
<ContextMenu.Root>
<ContextMenu.Trigger>
<>
<Cog6ToothIcon
className="h-4 w-4 ml-1 shrink-0 mt-1"
aria-hidden="true"
/>
<span className="whitespace-nowrap">
{t("admin_settings")}
</span>
<div className="flex w-full justify-end float-right">
<span className="flex h-6 w-6 shrink-0 items-center bg-transparent border-none justify-center text-md font-medium">
a
</span>
</div>
</>
</ContextMenu.Trigger>
<ContextMenu.Content>
<ContextMenu.Item shortcut="⌘ E">
Edit
</ContextMenu.Item>
<ContextMenu.Item shortcut="⌘ D">
Duplicate
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item shortcut="⌘ N">
Archive
</ContextMenu.Item>

<ContextMenu.Sub>
<ContextMenu.SubTrigger>
More
</ContextMenu.SubTrigger>
<ContextMenu.SubContent>
<ContextMenu.Item>
Move to project…
</ContextMenu.Item>
<ContextMenu.Item>
Move to folder…
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item>
Advanced options…
</ContextMenu.Item>
</ContextMenu.SubContent>
</ContextMenu.Sub>

<ContextMenu.Separator />
<ContextMenu.Item>Share</ContextMenu.Item>
<ContextMenu.Item>
Add to favorites
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item shortcut="⌘ ⌫" color="red">
Delete
</ContextMenu.Item>
</ContextMenu.Content>
</ContextMenu.Root>
<>
<Cog6ToothIcon
className="h-4 w-4 ml-1 shrink-0 mt-1"
aria-hidden="true"
/>
<span className="whitespace-nowrap">
{t("admin_settings")}
</span>
<div className="flex w-full justify-end float-right">
<span className="flex h-6 w-6 shrink-0 items-center bg-transparent border-none justify-center text-md font-medium">
a
</span>
</div>
</>
</Link>
)}
</li>
Expand Down
1 change: 1 addition & 0 deletions apps/client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"react-dom": "^18.3.1",
"react-frame-component": "^5.2.6",
"react-query": "^3.34.7",
"react-resizable-panels": "^2.0.19",
"react-simple-code-editor": "^0.13.1",
"react-spinners": "^0.11.0",
"react-table": "^7.7.0",
Expand Down
11 changes: 11 additions & 0 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4828,6 +4828,7 @@ __metadata:
react-dom: "npm:^18.3.1"
react-frame-component: "npm:^5.2.6"
react-query: "npm:^3.34.7"
react-resizable-panels: "npm:^2.0.19"
react-simple-code-editor: "npm:^0.13.1"
react-spinners: "npm:^0.11.0"
react-table: "npm:^7.7.0"
Expand Down Expand Up @@ -11848,6 +11849,16 @@ __metadata:
languageName: node
linkType: hard

"react-resizable-panels@npm:^2.0.19":
version: 2.0.19
resolution: "react-resizable-panels@npm:2.0.19"
peerDependencies:
react: ^16.14.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0
checksum: 10c0/eb9cb511aec917895dba842cb933c9885ea510f752b4f3b8c358bf33be8b7b6bf2fc4a81db7a16977e6b09f614a14c6652f15232ff03bce68a8845dcf179abf7
languageName: node
linkType: hard

"react-simple-code-editor@npm:^0.13.1":
version: 0.13.1
resolution: "react-simple-code-editor@npm:0.13.1"
Expand Down

0 comments on commit 949f914

Please sign in to comment.