Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix; user admin page #169

Merged
merged 87 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
6143afb
feat: modify the edit on profile
ervinpiol Sep 23, 2024
43bd5f6
fix: added necessary fixes to fix the deployment
SchadenKai Sep 23, 2024
224d054
Merge branch 'development-env' of https://github.com/enMedD/Conversat…
ervinpiol Sep 23, 2024
f09dc04
Merge branch 'development-env' of https://github.com/enMedD/enmedd-ai…
SchadenKai Sep 23, 2024
5692b87
feat: added addtl. user information for the user management endpoint
SchadenKai Sep 23, 2024
39f4981
feat: change the users page
ervinpiol Sep 23, 2024
363cacc
feat: added addtl. user information for the user management endpoint
SchadenKai Sep 23, 2024
12fedd5
Merge branch 'hotfix/fix-minor-bugs-in-dev-env' of https://github.com…
SchadenKai Sep 23, 2024
19ba108
Merge branch 'hotfix/fix-minor-bugs-in-dev-env' of https://github.com…
ervinpiol Sep 23, 2024
9807b27
feat: users page on the admin
ervinpiol Sep 23, 2024
2ace44d
feat: make the new revamp user page responsive
ervinpiol Sep 23, 2024
77fc959
feat: revamp login page
ervinpiol Sep 23, 2024
b276765
feat: revamp signup page
ervinpiol Sep 23, 2024
13e3777
feat: add the forgot password step
ervinpiol Sep 23, 2024
eda5106
feat: make the forgot password step functionable
ervinpiol Sep 23, 2024
6405cc7
feat: move the trigger of share chat modal
ervinpiol Sep 24, 2024
033384e
fix: filter the user joined teamspace
ervinpiol Sep 24, 2024
e9b182d
feat: add search for the existing data source
ervinpiol Sep 24, 2024
11ddf73
feat: create the 2factorauthentication page
ervinpiol Sep 24, 2024
399cab1
merge brach to development-env
ervinpiol Sep 24, 2024
20ef493
fix: signup and filter of teamspace
ervinpiol Sep 24, 2024
8ea0900
feat: create divider to change tremor
ervinpiol Sep 24, 2024
aa30aa1
fix: Failed to resolve 'HEAD' as a valid ref
ervinpiol Sep 24, 2024
93db59f
fix: git error
ervinpiol Sep 25, 2024
a00ea0b
feat: add validation state on creating new password
ervinpiol Sep 25, 2024
0d276a3
Merge branch 'development-env' into feature/rebranding/web-dev
SchadenKai Sep 25, 2024
24e0aee
feat: add password validation
ervinpiol Sep 25, 2024
1440137
feat: create usePasswordValidation hook
ervinpiol Sep 25, 2024
ace6527
feat: add the password validation on the profile
ervinpiol Sep 25, 2024
b5f52ec
Merge branch 'feature/rebranding/web-dev' of https://github.com/enMed…
ervinpiol Sep 25, 2024
e5e69c4
feat: ad truncate on badge on chat source
ervinpiol Sep 26, 2024
f62b353
feat: chnage popover shared chat
ervinpiol Sep 26, 2024
631c19b
feat: get the otp input
ervinpiol Sep 26, 2024
3c3f0e2
Merge branch 'development-env' into feature/rebranding/web-dev
SchadenKai Sep 26, 2024
0a1be45
feat: change some styles on the icon button
ervinpiol Sep 26, 2024
1b3244b
feat: add asChild prop
ervinpiol Sep 26, 2024
ba98374
feat: remove the overflow-x-auto
ervinpiol Sep 26, 2024
75865fc
feat: fix text size inconsistency on profile
ervinpiol Sep 26, 2024
3237da0
feat: fix the search sidebar on tablet
ervinpiol Sep 26, 2024
950b338
feat: fix sign in and sign up on mobile
ervinpiol Sep 26, 2024
f6e6075
fix: fix mobile and tablet view on the forgot password and verification
ervinpiol Sep 26, 2024
937ddcb
fix: fix mobile and tablet view on the profile
ervinpiol Sep 26, 2024
7133f69
Merge branch 'feature/rebranding/web-dev' of https://github.com/enMed…
ervinpiol Sep 26, 2024
dfaac8f
fix: useToast error
ervinpiol Sep 26, 2024
d4f48fd
feat: sort the available documentset alphabetically
ervinpiol Sep 27, 2024
9c44140
feat: add the document set search result belongs
ervinpiol Sep 27, 2024
22ddf14
feat: modify the like and dislike
ervinpiol Sep 27, 2024
8562ed4
Merge branch 'development-env' into feature/rebranding/web-dev
SchadenKai Sep 27, 2024
96cc864
feat: modify the table of query history
ervinpiol Sep 27, 2024
6cac2d6
fix: chat spacing
ervinpiol Sep 27, 2024
54ca266
feat: add token rate data
ervinpiol Sep 27, 2024
3136c4a
feat: update teamspace
ervinpiol Sep 27, 2024
502a4e5
Merge branch 'feature/rebranding/web-dev' of https://github.com/enMed…
ervinpiol Sep 27, 2024
0731c66
fix: workspace settings need 2 click to success
ervinpiol Sep 27, 2024
7f73b5b
merge with development-env
ervinpiol Sep 27, 2024
b5fc188
merge with feature/rebranding/web-dev
ervinpiol Sep 27, 2024
44eb0ee
fix overflow on users
ervinpiol Sep 27, 2024
ee230c0
fix: 2factor and forgot password page and start the combobox
ervinpiol Sep 28, 2024
5857355
feat: add new combobox component
ervinpiol Sep 28, 2024
01cc98f
feat: add badge on the combobox
ervinpiol Sep 28, 2024
6372bd8
fix: fix isLoading on sign in
ervinpiol Sep 29, 2024
82ae0cf
fix: shared chat not working
ervinpiol Sep 30, 2024
2d687f2
feat: enhance toast title and description
ervinpiol Sep 30, 2024
1f39e6a
feat: add shortcut key for chat and search
ervinpiol Sep 30, 2024
33af1ee
feat: add document set and assistant on the teamspace creation form
ervinpiol Sep 30, 2024
bfb2741
fix: teamspace assistant bubble length
ervinpiol Sep 30, 2024
7108cbc
fix: filter the public assistant, document set and connector
ervinpiol Sep 30, 2024
2da1c9d
feat: add description on teamspace modal
ervinpiol Sep 30, 2024
c90a44c
fix: add valid domains in users
ervinpiol Sep 30, 2024
992676a
feat: change the alt to control shortcut key
ervinpiol Sep 30, 2024
79971b5
feat: change the embedding modal
ervinpiol Sep 30, 2024
bf663ab
feat: add data source modal
ervinpiol Sep 30, 2024
28d60db
fix: upload button on click
ervinpiol Oct 1, 2024
c092b6b
fix: teamspace bug
ervinpiol Oct 1, 2024
5af316c
fix: No spaces when sended the prompts
ervinpiol Oct 1, 2024
e1ac0ee
feat: create a reusable functional search input
ervinpiol Oct 1, 2024
6241c23
feat: add a tooltip on the up to date status
ervinpiol Oct 1, 2024
148e39c
merge to development-env
ervinpiol Oct 1, 2024
efb6643
fix: error on Pending Invites
ervinpiol Oct 1, 2024
def3df4
fix: image not working
ervinpiol Oct 2, 2024
5021d62
feat: change alert to toast
ervinpiol Oct 2, 2024
18fae64
fix: delayed logo update
ervinpiol Oct 2, 2024
031c605
Merge branch 'bugfix/logo-issue/logo-not-showing' into feature/rebran…
ervinpiol Oct 2, 2024
2773c0a
fix: badge tooltip not position right
ervinpiol Oct 4, 2024
2918690
Merge branch 'feature/rebranding/frontend-web-dev' into feature/rebra…
ervinpiol Oct 4, 2024
2af2111
feat: center the align of pending user
ervinpiol Oct 4, 2024
caf7c0c
fix: remove the username on the invited user filter
ervinpiol Oct 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const CreateRateLimitModal = ({
}, [shouldFetchTeamspaces]);

return (
<div className="mt-4">
<div>
<Formik
initialValues={{
enabled: true,
Expand Down
2 changes: 1 addition & 1 deletion web/src/app/admin/users/AddUserButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const AddUserButton = () => {
<Button onClick={() => setIsModalOpen(true)}>Invite People</Button>
}
>
<div className="flex flex-col gap-y-3 pt-4">
<div className="flex flex-col gap-y-3">
<Label>
Add the email addresses to import, separated by whitespaces.
</Label>
Expand Down
20 changes: 6 additions & 14 deletions web/src/app/admin/users/PedingInvites.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,8 @@ export const PendingInvites = ({ q }: { q: string }) => {
(user) => !accepted.map((u) => u.email).includes(user.email)
);

const filteredUsers = finalInvited.filter(
(user) =>
user.full_name?.toLowerCase().includes(searchQuery.toLowerCase()) ||
user.full_name!.toLowerCase().includes(searchQuery.toLowerCase()) ||
user.email.toLowerCase().includes(searchQuery.toLowerCase())
const filteredUsers = finalInvited.filter((user) =>
user.email.toLowerCase().includes(searchQuery.toLowerCase())
);

const onRemovalSuccess = () => {
Expand Down Expand Up @@ -152,18 +149,13 @@ export const PendingInvites = ({ q }: { q: string }) => {
{filteredUsers.map((user) => (
<TableRow key={user.id}>
<TableCell>
<div className="flex gap-4">
<div className="flex items-center gap-4">
<div className="border rounded-full w-10 h-10 flex items-center justify-center">
<UserIcon />
</div>
<div className="flex flex-col">
<span className="truncate max-w-44">
{user.full_name}
</span>
<span className="text-sm text-subtle truncate max-w-44">
{user.email}
</span>
</div>
<span className="text-sm text-subtle truncate max-w-44">
{user.email}
</span>
</div>
</TableCell>
<TableCell>
Expand Down
48 changes: 0 additions & 48 deletions web/src/app/ee/admin/teams/TeamspaceCreationForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,51 +205,3 @@ export const TeamspaceCreationForm = ({
</div>
);
};
/* <div className="flex justify-between pb-4 gap-2 flex-col lg:flex-row">
<p className="whitespace-nowrap w-1/2 font-semibold">
Security Setting
</p>
<div className="flex items-center gap-2 w-full">
<Switch />
<p className="text-sm">
Activates private mode, chat and search activities
won&rsquo;t appear in the workspace admin&rsquo;s query
history
</p>
</div>
</div>

<div className="flex justify-between pb-4 gap-2 flex-col lg:flex-row">
<p className="whitespace-nowrap w-1/2 font-semibold">
Setup Storage Size
</p>
<div className="w-full">
<Select>
<SelectTrigger className="w-full">
<SelectValue placeholder="Option" />
</SelectTrigger>
<SelectContent>
<SelectItem value="option 1">Option 1</SelectItem>
<SelectItem value="option 2">Option 2</SelectItem>
</SelectContent>
</Select>
</div>
</div>

<div className="flex justify-between pb-4 gap-2 flex-col lg:flex-row">
<p className="whitespace-nowrap w-1/2 font-semibold">
Invite Users
</p>
<div className="flex items-center gap-2 w-full">
<Input placeholder="Enter email" />
<Select>
<SelectTrigger className="w-48">
<SelectValue placeholder="Role" />
</SelectTrigger>
<SelectContent>
<SelectItem value="member">Member</SelectItem>
<SelectItem value="admin">Admin</SelectItem>
</SelectContent>
</Select>
</div>
</div> */
1 change: 1 addition & 0 deletions web/src/components/admin/connectors/ConnectorTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export const ConnectorTitle = ({
</div>
}
asChild
align="start"
>
{ccPairName || sourceMetadata.displayName}
</CustomTooltip>
Expand Down
6 changes: 5 additions & 1 deletion web/src/components/admin/connectors/Field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,11 @@ export function SelectorFormField({

return (
<div className="pb-4">
{label && <ShadcnLabel>{label}</ShadcnLabel>}
{label && (
<ShadcnLabel className="text-sm font-semibold leading-none peer-disabled:cursor-not-allowed">
{label}
</ShadcnLabel>
)}
{subtext && <SubLabel>{subtext}</SubLabel>}

<div>
Expand Down
Loading