Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
260d9a0
[WEB-4802] fix: module sort order (#7674)
vamsikrishnamathala Sep 9, 2025
56cd0fc
[WEB-4025] fix: external user comment and reaction (#7692)
anmolsinghbhatia Sep 9, 2025
9ab3143
[WEB-4816] chore: add label flow (#7716)
anmolsinghbhatia Sep 9, 2025
4986132
[WEB-4841] chore: calendar component migration UI to propel (#7730)
anmolsinghbhatia Sep 9, 2025
43b7a6a
[WEB-4855] refactor: chart tick improvements (#7732)
JayashTripathy Sep 9, 2025
45688bd
[WEB-4860] dev: propel animated counter component (#7740)
anmolsinghbhatia Sep 9, 2025
5a63e6d
[WEB-4858] chore: error page ui revamp #7747
anmolsinghbhatia Sep 9, 2025
3b8bb1e
[WEB-4733] dev: propel toolbar component (#7742)
anmolsinghbhatia Sep 9, 2025
1c8ac3d
[WEB-4737] dev: propel pill component (#7743)
anmolsinghbhatia Sep 9, 2025
7e03264
[WEB-4730] dev: propel context menu component (#7745)
anmolsinghbhatia Sep 9, 2025
b0db4fc
[WEB-4736] dev: propel button (#7746)
anmolsinghbhatia Sep 9, 2025
6d116be
[WEB-4320] dev: propel emoji reaction component (#7741)
anmolsinghbhatia Sep 9, 2025
30b1751
chore (deps): django and vite version bump
sriramveeraghanta Sep 10, 2025
20d7730
Potential fix for code scanning alert no. 646: Server-side request fo…
sriramveeraghanta Sep 10, 2025
db18c35
Merge branch 'canary' of github.com:makeplane/plane into preview
sriramveeraghanta Sep 10, 2025
ac835bf
[WEB-4874]fix: calendar picker build errors and styles override (#7762)
vamsikrishnamathala Sep 10, 2025
0f7bfdd
[WEB-4877] fix: webapp crash because of bar chart (#7763)
JayashTripathy Sep 10, 2025
11cd8d1
[WIKI-632] chore: accept additional props for document collaborative …
1akhanBaheti Sep 11, 2025
ec541c2
[WEB-4854] chore: project admin accesss to workspace admins (#7749)
sangeethailango Sep 11, 2025
8d354b3
Potential fix for code scanning alert no. 636: URL redirection from r…
sriramveeraghanta Sep 11, 2025
4fe2ef7
[WEB-4441]fix: members account type dropdown position #7759
vamsikrishnamathala Sep 11, 2025
4cfea87
[WEB-4857] fix: applied filters root update #7750
vamsikrishnamathala Sep 11, 2025
8bf0595
[WEB-4858]chore: updated content for error page (#7766)
vamsikrishnamathala Sep 11, 2025
85f23b4
[WEB-4852] chore: views refactor (#7729)
vamsikrishnamathala Sep 11, 2025
8ee665f
[WEB-4875] fix: unsubscribed work items on workspace subscribed work …
sangeethailango Sep 11, 2025
76a0b38
[WEB-4890]fix: dropdown width #7778
vamsikrishnamathala Sep 11, 2025
b60f12a
[WEB-4861] fix: update redirection path in MagicSignInEndpoint to hom…
dheeru0198 Sep 11, 2025
9ffc30f
[WEB-4889] refactor: add fill in bar chart bar stroke (#7776)
JayashTripathy Sep 11, 2025
c3e7cfd
[WEB-4723] fix: disable project features on project create (#7625)
sriramveeraghanta Sep 12, 2025
116c811
[WIKI-659] chore: added issue relation and page sort order (#7784)
NarayanBavisetti Sep 15, 2025
345dfce
[WEB-4900]: validated authentication redirection paths (#7798)
pablohashescobar Sep 15, 2025
b9c6bb0
chore(deps): axios version upgrade to 1.12.0
sriramveeraghanta Sep 15, 2025
bd2272a
chore (deps): pnpm lockfile overrides update
sriramveeraghanta Sep 15, 2025
1f7eef5
chore: django import error
sriramveeraghanta Sep 15, 2025
56d3a9e
[WEB-4900] refactor: remove base_host retrieval from authentication v…
pablohashescobar Sep 16, 2025
bf45635
[WEB-4898] fix: extended sidebar toggle #7797
anmolsinghbhatia Sep 16, 2025
4d17637
[WEB-4943] refactor: streamline URL construction in authentication vi…
pablohashescobar Sep 16, 2025
00e070b
fix: codeql triggers
sriramveeraghanta Sep 16, 2025
d521eab
[WEB-4885] feat: new filters architecture and UI components (#7802)
prateekshourya29 Sep 16, 2025
6d3d9e6
[WEB-4943]: add url has allowed host or scheme for validating valid r…
pablohashescobar Sep 16, 2025
3d06189
[WEB-4943] refactor: enhance URL validation and redirection logic in …
pablohashescobar Sep 17, 2025
877c117
[WEB-4943]fix: next path url redirection (#7817)
vamsikrishnamathala Sep 17, 2025
696635d
[WEB-4956] fix: onboarding redirect with cache busting and code refac…
anmolsinghbhatia Sep 17, 2025
365d2d9
[WEB-4915]fix: redirection after onboarding completion #7824
vamsikrishnamathala Sep 18, 2025
68d72da
[WEB-4964] fix: update onboarding layout and enhance scroll behavior …
prateekshourya29 Sep 18, 2025
69c688b
[WEB-4873]: Add webhook log cleanup task and update Celery schedule (…
pablohashescobar Sep 18, 2025
f2057cd
[WEB-3528] fix: correct member id in modules list showing deleted_at …
pablohashescobar Sep 18, 2025
d5c3c0c
[WIKI-632] chore: add extended document editor props (#7783)
1akhanBaheti Sep 18, 2025
e26c506
[WEB-4899] fix: workspace admin cannot delete intake and cycle (#7807)
sangeethailango Sep 18, 2025
f59e557
[WEB-4879] refactor: organize stories and remove logs #7765
JayashTripathy Sep 18, 2025
9182c95
[WIKI-657] refactor: the page permissions in project (#7761)
NarayanBavisetti Sep 18, 2025
af6ea40
[WEB-4826]chore: reduced spacing for sub-work items list and relatio…
vamsikrishnamathala Sep 18, 2025
97059a2
[WEB-4952]fix: published view work item description #7828
vamsikrishnamathala Sep 18, 2025
f7d5ca4
[WEB-4953]fix: cycle progress percentage #7826
vamsikrishnamathala Sep 18, 2025
d5e5006
[WEB-4905]fix: cycle dates update (#7821)
vamsikrishnamathala Sep 18, 2025
9ede04f
[WEB-4851] chore: updated activity keys for work item (#7733)
NarayanBavisetti Sep 18, 2025
a40c73c
[WEB-4431]fix: table column distribution #7819
vamsikrishnamathala Sep 18, 2025
e6a7ca4
[WEB-4974] fix: table column spanning #7830
vamsikrishnamathala Sep 19, 2025
9aef5d4
[WEB-4951] [WEB-4884] feat: work item filters revamp (#7810)
prateekshourya29 Sep 19, 2025
36d3284
[WIKI-650] fix: pane extensions close method moved into hook (#7823)
Palanikannan1437 Sep 22, 2025
14e3aac
[WIKI-623] fix: add block menu to rich text editor (#7813)
iam-vipin Sep 22, 2025
47f68e3
[WEB-4979] fix: filters row missing for preset workspace views (#7836)
prateekshourya29 Sep 22, 2025
0ed49a6
[WIKI-694] chore: added summary endpoint for pages (#7842)
NarayanBavisetti Sep 23, 2025
dce8b75
[WIKI-638] fix: peek overview closing while dropdowns are open (#7841)
aaryan610 Sep 24, 2025
b5ba0a7
[WEB-4996] fix: accessing NoneType intake #7847
sangeethailango Sep 24, 2025
85bffaa
[WIKI-695] fix: tippy width fix #7843
Palanikannan1437 Sep 24, 2025
586a7a4
[WEB-4896]feat: filters to project and workspace members list (#7786)
vamsikrishnamathala Sep 24, 2025
7f28cbe
[WEB-4980] dev: propel modal portal component (#7851)
anmolsinghbhatia Sep 25, 2025
19e00b0
[WEB-5001]fix: prop name for sub work permissions #7854
vamsikrishnamathala Sep 25, 2025
b946b3a
[WEB-4981] fix: analytics modal portal (#7852)
anmolsinghbhatia Sep 25, 2025
c05a5eb
[WEB-4981] fix: analytics portal modal #7858
anmolsinghbhatia Sep 26, 2025
bedc1fa
[WEB-5027] fix: replace lodash package with lodash-es (#7856)
sriramveeraghanta Sep 26, 2025
e891482
[WEB-4881] feat(utils): add URL display formatter #7770
vihar Sep 29, 2025
1fb22bd
[WEB-4805] fix: upgraded psycopgy packages to fix linting and removed…
pablohashescobar Sep 29, 2025
9237f56
[WEB-5044] fix: ruff lint and format errors (#7868)
sriramveeraghanta Sep 29, 2025
ded3678
feat: optimize project list external endpoint (#7869)
sriramveeraghanta Sep 29, 2025
843faf8
[WIKI-668] fix: comments mention #7874
aaryan610 Sep 30, 2025
0ad439f
[WIKI-696] fix: peek view close on click block menu options (#7861)
iam-vipin Sep 30, 2025
7265290
[WEB-4934] dev: propel button implementation (#7859)
anmolsinghbhatia Sep 30, 2025
c45151d
[WEB-4882]feat: suspended users (#7844)
vamsikrishnamathala Sep 30, 2025
992457e
[WEB-5050] feat: updated work item urls with issues. (#7871)
sriramveeraghanta Sep 30, 2025
7ce21a6
[WEB-4969] feat: add toggle button for work item filters row visibili…
prateekshourya29 Sep 30, 2025
5951372
[WIKI-679] refactor: live server (#7720)
sriramveeraghanta Sep 30, 2025
e110ef5
[WIKI-569] chore: migrate to tiptap v3 (#7526)
aaryan610 Sep 30, 2025
ee68895
[WIKI-682] feat: hocuspocus v3 server migration (#7880)
Palanikannan1437 Sep 30, 2025
a69c6f1
regression: slash commands render logic #7882
aaryan610 Sep 30, 2025
b37e453
[WIKI-699] refactor: editor config (#7850)
iam-vipin Oct 1, 2025
931a48d
[WIKI-569] regression: parser kit extensions mismatch #7885
aaryan610 Oct 1, 2025
794271a
fix-config_types (#7886)
iam-vipin Oct 1, 2025
f6677f2
[WIKI-704] fix: hocuspocus error handling (#7898)
Palanikannan1437 Oct 3, 2025
3c389e2
[WEB-5072] chore: propel combobox improvement #7899
anmolsinghbhatia Oct 3, 2025
269fc0d
[WIKI-705] regression: mentions dropdown selection across editors #7901
aaryan610 Oct 3, 2025
431af01
[WIKI-704] fix: disable exiting on unhandled rejection/exception #7902
Palanikannan1437 Oct 3, 2025
b695f16
[WEB-5074] fix: remove the filter conditions check from the defaultOp…
prateekshourya29 Oct 3, 2025
4709a0f
chore(deps): bump django (#7892)
dependabot[bot] Oct 5, 2025
97381c5
chore(deps): pnpm version upgrade
sriramveeraghanta Oct 5, 2025
8d14a5a
chore(deps): added vite to catalog
sriramveeraghanta Oct 5, 2025
4c8f515
chore: pmp lock upgrade
sriramveeraghanta Oct 5, 2025
0cca31e
[WIKI-707] [WIKI-708] fix: editor floating ui modal (#7909)
iam-vipin Oct 6, 2025
cbcb026
[WEB-5083] chore: add stories to propel #7888
lifeiscontent Oct 6, 2025
0589ac5
[WEB-5048] chore: implements esm exports for all packages (#7816)
sriramveeraghanta Oct 6, 2025
5c842d5
Chore: Filter backend optimizations (#7900)
dheeru0198 Oct 6, 2025
f9e21c5
Deployment AIO fixed live entered FATAL state (#7893)
SloCompTech Oct 6, 2025
298acb1
[MOB-1221] dev: updated god mode ui #7879
gurusainath Oct 6, 2025
a740a9f
[WIKI-713] fix: extra line created on enter key #7913
Palanikannan1437 Oct 7, 2025
d3024f8
[WEB-4731] feat: add baseui input component to propel package (#7769)
JayashTripathy Oct 7, 2025
07ff457
[PRIME-24] fix: update live server aio build path (#7911)
sriramveeraghanta Oct 7, 2025
2ca8620
Add codespell support (config, workflow to detect/not fix) and make i…
yarikoptic Oct 7, 2025
c3e8ce8
[WIKI-710] [WIKI-717] fix: slash commands and mentions in comments (#…
Palanikannan1437 Oct 7, 2025
f5eb13f
[WEB-5086] fix: instance setup screen asset #7914
anmolsinghbhatia Oct 7, 2025
0b15a32
[WEB-5038] fix: cycle creation in external api endpoint (#7866)
pablohashescobar Oct 7, 2025
89ddd1b
[WEB-5081] fix: update timezone in user settings #7915
sangeethailango Oct 7, 2025
3e82984
[WEB-5068] fix: CustomMenu closeOnSelect behavior #7897
anmolsinghbhatia Oct 7, 2025
d38f481
[WEB-3567] dev: empty state v2 (#7910)
anmolsinghbhatia Oct 7, 2025
3cbb604
[WEB-4976]chore: propel toast implementation (#7832)
vamsikrishnamathala Oct 7, 2025
5d60d6d
chore: adding types node package to pnpm catalog (#7923)
sriramveeraghanta Oct 8, 2025
f2539c5
fix: editor dropdowns positioning (#7927)
aaryan610 Oct 8, 2025
0b257c8
[WEB-5093] improvement: adds content-based MIME type detection for up…
prateekshourya29 Oct 9, 2025
0f03870
fix: hocuspocus version upgrade (#7928)
Palanikannan1437 Oct 9, 2025
afac9f7
[WEB-5101]fix: toast action items hover behaviour (#7929)
vamsikrishnamathala Oct 9, 2025
561ae82
chore: update gitignore and dockerignore
sriramveeraghanta Oct 9, 2025
98e0089
[WIKI-722] fix: hocuspocus provider update to v3 (#7930)
Palanikannan1437 Oct 9, 2025
1895cfe
Update docker-compose.yml for valkey security patch (#7926)
c0ldb00t3r Oct 9, 2025
75cd201
[WEB-5104] chore: base-ui package upgrade and combobox migration (#7931)
anmolsinghbhatia Oct 9, 2025
b7c14ac
[WEB-5104] chore: combobox improvements (#7933)
anmolsinghbhatia Oct 9, 2025
ae215a5
[WIKI-724 ] feat: sentry setup for live express server #7934
sriramveeraghanta Oct 9, 2025
5d161f6
[INFRA-246] Update Valkey image version to 7.2.11-alpine in docker-co…
akshat5302 Oct 9, 2025
d8c1dff
[WIKI-725] regression: editor floaters propagation #7938
aaryan610 Oct 9, 2025
c88ed33
chore: package version upgrade
sriramveeraghanta Oct 9, 2025
71ec9fa
chore: package versions
sriramveeraghanta Oct 9, 2025
9ce6179
[WEB-5120] refactor: add onSearchQueryKeyDown prop to ComboboxOptions…
JayashTripathy Oct 10, 2025
8cd29c5
fix: adding comprehensive logs for live server (#7947)
sriramveeraghanta Oct 10, 2025
1516746
[WEB-5059] feat: add page creation functionality to workspace seeding…
pablohashescobar Oct 10, 2025
2c17f8a
[WEB-5103] fix: custom menu event propagation (#7932)
anmolsinghbhatia Oct 11, 2025
70be4a4
[WEB-5127] chore: added readonly properties + fixed state dropdown + …
gakshita Oct 11, 2025
c3dd790
[WEB-5058] feat: enhance workspace seeding with cycles, modules, and …
pablohashescobar Oct 11, 2025
c561164
chore(deps): happy dom resolution added
sriramveeraghanta Oct 13, 2025
3eecec5
chore(deps): lock file resolutions
sriramveeraghanta Oct 13, 2025
c736354
[WEB-5130] chore: propel scroll area improvement #7952
anmolsinghbhatia Oct 13, 2025
87eb194
[WEB-5129] feat: icons revamp (#7945)
anmolsinghbhatia Oct 13, 2025
ffe38b5
[WEB-5080] fix: attachment and link count in spreadsheet columns #7942
vamsikrishnamathala Oct 13, 2025
c80c76b
[WEB-5136] refactor: update `admin` ESLint configuration and refactor…
prateekshourya29 Oct 13, 2025
eee9744
[WEB-5119] chore: remove any deprecated toast instances from the plan…
prateekshourya29 Oct 13, 2025
ddf07dc
[WEB-5029] chore: updates icons for title and description #7862
vamsikrishnamathala Oct 13, 2025
9f41e92
[WEB-5135] refactor: update `sites` ESLint configuration and refactor…
prateekshourya29 Oct 13, 2025
cfb4a82
[WEB-5099] improvement: enhance rich filters with new components and …
prateekshourya29 Oct 13, 2025
56007e7
[WEB-5129] chore: icons revamp (#7958)
anmolsinghbhatia Oct 14, 2025
9dc14d8
[WEB-5139] fix: custom menu item link (#7959)
anmolsinghbhatia Oct 14, 2025
4168127
[WEB-4999] feat: implement flexible data export utility with CSV, JSO…
dheeru0198 Oct 14, 2025
9cfde89
[WEB-5134] refactor: update web ESLint configuration and refactor imp…
prateekshourya29 Oct 14, 2025
a3019eb
[WEB-5092] feat: app sidebar enhancements (#7946)
anmolsinghbhatia Oct 14, 2025
606e34e
[WIKI-730] chore: handle body too large error (#7963)
NarayanBavisetti Oct 14, 2025
97e6622
[WEB-5125] fix: suspended user view #7964
vamsikrishnamathala Oct 14, 2025
1a9ebc8
[WEB-5071] chore: implement webhook logging to MongoDB and fallback t…
pablohashescobar Oct 15, 2025
196baf0
chore: lint errors
sriramveeraghanta Oct 15, 2025
44a483f
[WEB-5142] fix: Issue modal styling #7961
gakshita Oct 15, 2025
ee176ef
[WEB-5095]chore: updated delete modal info content (#7967)
vamsikrishnamathala Oct 15, 2025
f9cca8e
fix: live server log
sriramveeraghanta Oct 15, 2025
2b106cb
[WEB-5054]feat: added activity filters for state and assignee activit…
vamsikrishnamathala Oct 15, 2025
a8c253a
[WEB-5154] chore: nav button text colour updated #7970
anmolsinghbhatia Oct 15, 2025
9d757cc
[WEB-5156] fix: activity filters bug #7971
vamsikrishnamathala Oct 15, 2025
00807d2
[WEB-5157] chore: fix propel icon clip paths #7975
lifeiscontent Oct 16, 2025
98b81d7
chore(deps): happy dom version bump
sriramveeraghanta Oct 16, 2025
f266cd8
[WEB-5162] fix: add exporter URL patterns for exporting issues (#7977)
pablohashescobar Oct 16, 2025
59022b6
fix: vite package upgrade
sriramveeraghanta Oct 21, 2025
64781be
regression: downgrade to tiptap v2 (#7982)
aaryan610 Oct 21, 2025
1b43efb
chore: version bump
sriramveeraghanta Oct 21, 2025
d6657d5
[WEB-5207] fix: update date formatting in IssueExportSchema for cycle…
pablohashescobar Oct 22, 2025
addf3c4
chore: added live server secret key in community docker file
sriramveeraghanta Oct 23, 2025
b34c9ca
fix: live server secret key app version env variables (#7997)
sriramveeraghanta Oct 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[codespell]
# Ref: https://github.com/codespell-project/codespell#using-a-config-file
skip = .git*,*.svg,i18n,*-lock.yaml,*.css,.codespellrc,migrations,*.js,*.map,*.mjs
check-hidden = true
# ignore all CamelCase and camelCase
ignore-regex = \b[A-Za-z][a-z]+[A-Z][a-zA-Z]+\b
ignore-words-list = tread
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,9 @@ temp/
# Misc
*.pem
*.key

# React Router - https://github.com/remix-run/react-router-templates/blob/dc79b1a065f59f3bfd840d4ef75cc27689b611e6/default/.dockerignore
.react-router/
build/
node_modules/
README.md
6 changes: 2 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ name: "CodeQL"
on:
workflow_dispatch:
push:
branches: ["preview", "master"]
branches: ["preview", "canary", "master"]
pull_request:
branches: ["develop", "preview", "master"]
schedule:
- cron: "53 19 * * 5"
branches: ["preview", "canary", "master"]

jobs:
analyze:
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Codespell configuration is within .codespellrc
---
name: Codespell

on:
push:
branches: [preview]
pull_request:
branches: [preview]

permissions:
contents: read

jobs:
codespell:
name: Check for spelling errors
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Annotate locations with typos
uses: codespell-project/codespell-problem-matcher@v1
- name: Codespell
uses: codespell-project/actions-codespell@v2
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ node_modules
/out/

# Production
/build
dist/
out/
build/
.react-router/

# Misc
.DS_Store
Expand Down Expand Up @@ -99,3 +100,5 @@ dev-editor
*.rdb.gz

storybook-static

CLAUDE.md
2 changes: 2 additions & 0 deletions .mise.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[tools]
node = "22.18.0"
14 changes: 14 additions & 0 deletions apps/admin/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
module.exports = {
root: true,
extends: ["@plane/eslint-config/next.js"],
rules: {
"no-duplicate-imports": "off",
"import/no-duplicates": ["error", { "prefer-inline": false }],
"import/consistent-type-specifier-style": ["error", "prefer-top-level"],
"@typescript-eslint/no-import-type-side-effects": "error",
"@typescript-eslint/consistent-type-imports": [
"error",
{
prefer: "type-imports",
fixStyle: "separate-type-imports",
disallowTypeAnnotations: false,
},
],
},
};
10 changes: 6 additions & 4 deletions apps/admin/app/(all)/(dashboard)/ai/form.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
"use client";
import { FC } from "react";
import type { FC } from "react";
import { useForm } from "react-hook-form";
import { Lightbulb } from "lucide-react";
import { IFormattedInstanceConfiguration, TInstanceAIConfigurationKeys } from "@plane/types";
import { Button, TOAST_TYPE, setToast } from "@plane/ui";
import { Button } from "@plane/propel/button";
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import type { IFormattedInstanceConfiguration, TInstanceAIConfigurationKeys } from "@plane/types";
// components
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
import type { TControllerInputFormField } from "@/components/common/controller-input";
import { ControllerInput } from "@/components/common/controller-input";
// hooks
import { useInstance } from "@/hooks/store";

Expand Down
4 changes: 2 additions & 2 deletions apps/admin/app/(all)/(dashboard)/ai/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReactNode } from "react";
import { Metadata } from "next";
import type { ReactNode } from "react";
import type { Metadata } from "next";

export const metadata: Metadata = {
title: "Artificial Intelligence Settings - God Mode",
Expand Down
52 changes: 39 additions & 13 deletions apps/admin/app/(all)/(dashboard)/authentication/github/form.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
"use client";

import { FC, useState } from "react";
import isEmpty from "lodash/isEmpty";
import type { FC } from "react";
import { useState } from "react";
import { isEmpty } from "lodash-es";
import Link from "next/link";
import { useForm } from "react-hook-form";
import { Monitor } from "lucide-react";
// plane internal packages
import { API_BASE_URL } from "@plane/constants";
import { IFormattedInstanceConfiguration, TInstanceGithubAuthenticationConfigurationKeys } from "@plane/types";
import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
import { Button, getButtonStyling } from "@plane/propel/button";
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import type { IFormattedInstanceConfiguration, TInstanceGithubAuthenticationConfigurationKeys } from "@plane/types";

import { cn } from "@plane/utils";
// components
import { CodeBlock } from "@/components/common/code-block";
import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
import { CopyField, TCopyField } from "@/components/common/copy-field";
import type { TControllerInputFormField } from "@/components/common/controller-input";
import { ControllerInput } from "@/components/common/controller-input";
import type { TCopyField } from "@/components/common/copy-field";
import { CopyField } from "@/components/common/copy-field";
// hooks
import { useInstance } from "@/hooks/store";

Expand Down Expand Up @@ -101,7 +107,7 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
},
];

const GITHUB_SERVICE_FIELD: TCopyField[] = [
const GITHUB_COMMON_SERVICE_DETAILS: TCopyField[] = [
{
key: "Origin_URL",
label: "Origin URL",
Expand All @@ -121,6 +127,9 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
</>
),
},
];

const GITHUB_SERVICE_DETAILS: TCopyField[] = [
{
key: "Callback_URI",
label: "Callback URI",
Expand Down Expand Up @@ -208,12 +217,29 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
</div>
</div>
</div>
<div className="col-span-2 md:col-span-1">
<div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
<div className="pt-2 text-xl font-medium">Plane-provided details for GitHub</div>
{GITHUB_SERVICE_FIELD.map((field) => (
<CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
))}
<div className="col-span-2 md:col-span-1 flex flex-col gap-y-6">
<div className="pt-2 text-xl font-medium">Plane-provided details for GitHub</div>

<div className="flex flex-col gap-y-4">
{/* common service details */}
<div className="flex flex-col gap-y-4 px-6 py-4 bg-custom-background-80 rounded-lg">
{GITHUB_COMMON_SERVICE_DETAILS.map((field) => (
<CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
))}
</div>

{/* web service details */}
<div className="flex flex-col rounded-lg overflow-hidden">
<div className="px-6 py-3 bg-custom-background-80/60 font-medium text-xs uppercase flex items-center gap-x-3 text-custom-text-200">
<Monitor className="w-3 h-3" />
Web
</div>
<div className="px-6 py-4 flex flex-col gap-y-4 bg-custom-background-80">
{GITHUB_SERVICE_DETAILS.map((field) => (
<CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
))}
</div>
</div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReactNode } from "react";
import { Metadata } from "next";
import type { ReactNode } from "react";
import type { Metadata } from "next";

export const metadata: Metadata = {
title: "GitHub Authentication - God Mode",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import Image from "next/image";
import { useTheme } from "next-themes";
import useSWR from "swr";
// plane internal packages
import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
import { setPromiseToast } from "@plane/propel/toast";
import { Loader, ToggleSwitch } from "@plane/ui";
import { resolveGeneralTheme } from "@plane/utils";
// components
import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";
Expand Down
16 changes: 10 additions & 6 deletions apps/admin/app/(all)/(dashboard)/authentication/gitlab/form.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
import { FC, useState } from "react";
import isEmpty from "lodash/isEmpty";
import type { FC } from "react";
import { useState } from "react";
import { isEmpty } from "lodash-es";
import Link from "next/link";
import { useForm } from "react-hook-form";
// plane internal packages
import { API_BASE_URL } from "@plane/constants";
import { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfigurationKeys } from "@plane/types";
import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
import { Button, getButtonStyling } from "@plane/propel/button";
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import type { IFormattedInstanceConfiguration, TInstanceGitlabAuthenticationConfigurationKeys } from "@plane/types";
import { cn } from "@plane/utils";
// components
import { CodeBlock } from "@/components/common/code-block";
import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
import { CopyField, TCopyField } from "@/components/common/copy-field";
import type { TControllerInputFormField } from "@/components/common/controller-input";
import { ControllerInput } from "@/components/common/controller-input";
import type { TCopyField } from "@/components/common/copy-field";
import { CopyField } from "@/components/common/copy-field";
// hooks
import { useInstance } from "@/hooks/store";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReactNode } from "react";
import { Metadata } from "next";
import type { ReactNode } from "react";
import type { Metadata } from "next";

export const metadata: Metadata = {
title: "GitLab Authentication - God Mode",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { useState } from "react";
import { observer } from "mobx-react";
import Image from "next/image";
import useSWR from "swr";
import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
import { setPromiseToast } from "@plane/propel/toast";
import { Loader, ToggleSwitch } from "@plane/ui";
// components
import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";
// hooks
Expand Down
51 changes: 38 additions & 13 deletions apps/admin/app/(all)/(dashboard)/authentication/google/form.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
"use client";
import { FC, useState } from "react";
import isEmpty from "lodash/isEmpty";
import type { FC } from "react";
import { useState } from "react";
import { isEmpty } from "lodash-es";
import Link from "next/link";
import { useForm } from "react-hook-form";
import { Monitor } from "lucide-react";
// plane internal packages
import { API_BASE_URL } from "@plane/constants";
import { IFormattedInstanceConfiguration, TInstanceGoogleAuthenticationConfigurationKeys } from "@plane/types";
import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
import { Button, getButtonStyling } from "@plane/propel/button";
import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import type { IFormattedInstanceConfiguration, TInstanceGoogleAuthenticationConfigurationKeys } from "@plane/types";
import { cn } from "@plane/utils";
// components
import { CodeBlock } from "@/components/common/code-block";
import { ConfirmDiscardModal } from "@/components/common/confirm-discard-modal";
import { ControllerInput, TControllerInputFormField } from "@/components/common/controller-input";
import { CopyField, TCopyField } from "@/components/common/copy-field";
import type { TControllerInputFormField } from "@/components/common/controller-input";
import { ControllerInput } from "@/components/common/controller-input";
import type { TCopyField } from "@/components/common/copy-field";
import { CopyField } from "@/components/common/copy-field";
// hooks
import { useInstance } from "@/hooks/store";

Expand Down Expand Up @@ -90,7 +95,7 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
},
];

const GOOGLE_SERVICE_DETAILS: TCopyField[] = [
const GOOGLE_COMMON_SERVICE_DETAILS: TCopyField[] = [
{
key: "Origin_URL",
label: "Origin URL",
Expand All @@ -110,6 +115,9 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
</p>
),
},
];

const GOOGLE_SERVICE_DETAILS: TCopyField[] = [
{
key: "Callback_URI",
label: "Callback URI",
Expand Down Expand Up @@ -195,12 +203,29 @@ export const InstanceGoogleConfigForm: FC<Props> = (props) => {
</div>
</div>
</div>
<div className="col-span-2 md:col-span-1">
<div className="flex flex-col gap-y-4 px-6 pt-1.5 pb-4 bg-custom-background-80/60 rounded-lg">
<div className="pt-2 text-xl font-medium">Plane-provided details for Google</div>
{GOOGLE_SERVICE_DETAILS.map((field) => (
<CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
))}
<div className="col-span-2 md:col-span-1 flex flex-col gap-y-6">
<div className="pt-2 text-xl font-medium">Plane-provided details for Google</div>

<div className="flex flex-col gap-y-4">
{/* common service details */}
<div className="flex flex-col gap-y-4 px-6 py-4 bg-custom-background-80 rounded-lg">
{GOOGLE_COMMON_SERVICE_DETAILS.map((field) => (
<CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
))}
</div>

{/* web service details */}
<div className="flex flex-col rounded-lg overflow-hidden">
<div className="px-6 py-3 bg-custom-background-80/60 font-medium text-xs uppercase flex items-center gap-x-3 text-custom-text-200">
<Monitor className="w-3 h-3" />
Web
</div>
<div className="px-6 py-4 flex flex-col gap-y-4 bg-custom-background-80">
{GOOGLE_SERVICE_DETAILS.map((field) => (
<CopyField key={field.key} label={field.label} url={field.url} description={field.description} />
))}
</div>
</div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReactNode } from "react";
import { Metadata } from "next";
import type { ReactNode } from "react";
import type { Metadata } from "next";

export const metadata: Metadata = {
title: "Google Authentication - God Mode",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { useState } from "react";
import { observer } from "mobx-react";
import Image from "next/image";
import useSWR from "swr";
import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
import { setPromiseToast } from "@plane/propel/toast";
import { Loader, ToggleSwitch } from "@plane/ui";
// components
import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";
// hooks
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/app/(all)/(dashboard)/authentication/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReactNode } from "react";
import { Metadata } from "next";
import type { ReactNode } from "react";
import type { Metadata } from "next";

export const metadata: Metadata = {
title: "Authentication Settings - Plane Web",
Expand Down
5 changes: 3 additions & 2 deletions apps/admin/app/(all)/(dashboard)/authentication/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { useState } from "react";
import { observer } from "mobx-react";
import useSWR from "swr";
// plane internal packages
import { TInstanceConfigurationKeys } from "@plane/types";
import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
import { setPromiseToast } from "@plane/propel/toast";
import type { TInstanceConfigurationKeys } from "@plane/types";
import { Loader, ToggleSwitch } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { useInstance } from "@/hooks/store";
Expand Down
Loading
Loading