Skip to content

feat(client): when adding members to an engine by name or email displayed already added #1211

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jun 10, 2025
Merged

feat(client): when adding members to an engine by name or email displayed already added #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56347d8
feat(client): when adding members to an engine by name or email displ…
aditiiisinhaa May 23, 2025
b91819d
Update MembersAddOverlay.tsx
aditiiisinhaa May 26, 2025
011029c
Update MembersAddOverlay.tsx
aditiiisinhaa May 26, 2025
0a0b8c7
Merge branch 'dev' into AddingMemberToEngineDisplayAlreadyAdded
AAfghahi May 28, 2025
4f6416e
Merge branch 'dev' into AddingMemberToEngineDisplayAlreadyAdded
AAfghahi May 28, 2025
2a76ece
Merge branch 'dev' into AddingMemberToEngineDisplayAlreadyAdded
anurag91jain Jun 3, 2025
4618295
Merge branch 'dev' into AddingMemberToEngineDisplayAlreadyAdded
anurag91jain Jun 7, 2025
1dc4fd4
Merge branch 'dev' of https://github.com/SEMOSS/semoss-ui into Adding…
anurag91jaindel Jun 7, 2025
3578879
Merge branch 'AddingMemberToEngineDisplayAlreadyAdded' of https://git…
anurag91jaindel Jun 7, 2025
3359ed1
feat(sdk): removing the import as it is being used
anurag91jain Jun 8, 2025
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
1 change: 0 additions & 1 deletion libs/ui/src/components/Autocomplete/Autocomplete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export interface AutocompleteProps<
| "disableCloseOnSelect"
| "disabledItemsFocusable"
| "disableListWrap"
| "getOptionDisabled"
| "handleHomeEndKeys"
| "openOnFocus"
| "selectOnFocus"
Expand Down
178 changes: 111 additions & 67 deletions packages/client/src/components/settings/MembersAddOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ import {
useNotification,
TextField,
Select,
Grid,
} from '@semoss/ui';

import { ALL_TYPES } from '@/types';
import { PERMISSION_DESCRIPTION_MAP } from '@/constants';
import { useAPI, useDebounceValue, useRootStore, useSettings } from '@/hooks';
import { useDebounceValue, useRootStore, useSettings } from '@/hooks';
import { MembersAddOverlayUser } from './MembersAddOverlayUser';
import { SETTINGS_ROLE } from './settings.types';
import { permissionPriorityMapper } from '@/utility/general';
Expand Down Expand Up @@ -203,54 +202,91 @@ export const MembersAddOverlay = (props: MembersAddOverlayProps) => {
setSearch('');
}, [open]);

// TODO: Implement Lazy Loading
// get the api
const getMembersApi: Parameters<typeof useAPI>[0] =
type === 'DATABASE' ||
type === 'STORAGE' ||
type === 'MODEL' ||
type === 'VECTOR' ||
type === 'FUNCTION'
? [
'getEngineUsersNoCredentials',
adminMode,
id,
AUTOCOMPLETE_LIMIT, // limit
offset, // offset
debouncedSearch ? debouncedSearch : undefined,
]
: type === 'APP'
? [
'getProjectUsersNoCredentials',
adminMode,
id,
AUTOCOMPLETE_LIMIT, // limit
offset, // offset
debouncedSearch ? debouncedSearch : undefined,
]
: null;

const getMembers = useAPI(open ? getMembersApi : null);

const isLoading =
getMembers.status === 'INITIAL' || getMembers.status === 'LOADING';

useEffect(() => {
if (getMembers.status === 'SUCCESS') {
if (getMembers.data.data.length < AUTOCOMPLETE_LIMIT) {
setInfiniteOn(false);
}
if (renderedMembers.length >= AUTOCOMPLETE_LIMIT && offset > 0) {
setRenderedMembers((prev) => {
return [...prev, ...getMembers.data.data];
});
setSearchLoading(false);
} else {
setRenderedMembers(getMembers.data.data);
setSearchLoading(false);
if (!open) return;

const cancelled = false;
setSearchLoading(true);

const fetchUsers = async () => {
try {
let all = [];
if (type === 'APP') {
const [noCred, cred] = await Promise.all([
monolithStore.getProjectUsersNoCredentials(
adminMode,
id,
AUTOCOMPLETE_LIMIT,
offset,
debouncedSearch || '',
),
monolithStore.getProjectUsers(
adminMode,
id,
debouncedSearch || '',
'', // permission
offset,
AUTOCOMPLETE_LIMIT,
),
]);
all = [...(noCred?.data || []), ...(cred?.members || [])];
} else if (
type === 'DATABASE' ||
type === 'STORAGE' ||
type === 'MODEL' ||
type === 'VECTOR' ||
type === 'FUNCTION'
) {
const [noCred, cred] = await Promise.all([
monolithStore.getEngineUsersNoCredentials(
adminMode,
id,
AUTOCOMPLETE_LIMIT,
offset,
debouncedSearch || '',
),
monolithStore.getEngineUsers(
adminMode,
id,
debouncedSearch || '',
'', // permission
offset,
AUTOCOMPLETE_LIMIT,
),
]);
all = [...(noCred?.data || []), ...(cred?.members || [])];
} else {
setSearchLoading(false);
return;
}

if (!cancelled) {
if (all.length < AUTOCOMPLETE_LIMIT) setInfiniteOn(false);
if (
renderedMembers.length >= AUTOCOMPLETE_LIMIT &&
offset > 0
) {
setRenderedMembers((prev) => [...prev, ...all]);
} else {
setRenderedMembers(all);
}
setSearchLoading(false);
}
} catch (e) {
if (!cancelled) {
notification.add({
color: 'error',
message: String(e),
});
setSearchLoading(false);
}
}
}
}, [getMembers.status]);
};

fetchUsers();
}, [open, debouncedSearch, offset, adminMode, id, type]);

const isLoading = searchLoading;

const getAdditionalMembers = () => {
setOffset(offset + AUTOCOMPLETE_LIMIT);
Expand Down Expand Up @@ -291,16 +327,6 @@ export const MembersAddOverlay = (props: MembersAddOverlayProps) => {
json['maxResponseTime'] = Number(maxTime);
}

// usageRestriction:
// restriction === 'null' ? null : restriction,
// usageFrequency: frequency,
// ...(restriction === 'token' && {
// maxTokens: Number(maxTokens),
// }),
// ...(restriction === 'compute' && {
// maxResponseTime: Number(maxTime),
// }),

return json;
});

Expand Down Expand Up @@ -347,9 +373,6 @@ export const MembersAddOverlay = (props: MembersAddOverlayProps) => {

success = true;

// refresh the members
getMembers.refresh();

onChange();
} else {
notification.add({
Expand Down Expand Up @@ -552,16 +575,37 @@ export const MembersAddOverlay = (props: MembersAddOverlayProps) => {
onChange={(event, newValue) => {
setSelectedMembers(newValue || []);
}}
getOptionDisabled={(option) => !!option.permission}
renderOption={(props, option) => {
const { ...optionProps } = props;
const hasPermission = !!option.permission;
return (
<li key={option.id} {...optionProps}>
<MembersAddOverlayUser
name={option.name}
id={option.id}
email={option.email}
type={option.type}
/>
<div
style={{
maxWidth: '85%',
overflow: 'hidden',
}}
>
<MembersAddOverlayUser
name={option.name}
id={option.id}
email={option.email}
type={option.type}
/>
</div>

{hasPermission && (
<div
style={{
whiteSpace: 'nowrap',
display: 'inline-block',
fontSize: '12px',
}}
>
Already Added
</div>
)}
</li>
);
}}
Expand Down
10 changes: 8 additions & 2 deletions packages/client/src/components/settings/MembersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,10 @@ export const MembersTable = (props: MembersTableProps) => {
value="Editor"
label="Editor"
disabled={
(userPermission === 'Editor' && user.permission === 'OWNER') ||
(userPermission ===
'Editor' &&
user.permission ===
'OWNER') ||
!configStore.isEngineOperationAvailable(
type,
'access',
Expand All @@ -933,7 +936,10 @@ export const MembersTable = (props: MembersTableProps) => {
value="Read-Only"
label="Read-Only"
disabled={
(userPermission === 'Editor' && user.permission === 'OWNER') ||
(userPermission ===
'Editor' &&
user.permission ===
'OWNER') ||
!configStore.isEngineOperationAvailable(
type,
'access',
Expand Down