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.

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

Fix 404 when viewing user group's domain #166

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Fix 404 when viewing user group's domain #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a4c689
Fix 404 when viewing user group's domain
nas-tabchiche Mar 20, 2024
8cf63fa
fix: sidebar footer overflow for long names
Mohamed-Hacene Mar 20, 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
2 changes: 1 addition & 1 deletion frontend/src/lib/components/SideBar/SideBar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
open
)}"
>
<nav class="flex-1 flex flex-col overflow-y-auto bg-gray-50 py-4 px-3">
<nav class="flex-1 flex flex-col overflow-y-auto overflow-x-hidden bg-gray-50 py-4 px-3">
<SideBarHeader />
<SideBarNavigation />
<SideBarFooter />
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/lib/components/SideBar/SideBarFooter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@

<div class="border-t pt-2.5">
<div class="flex flex-row items-center justify-between">
<div class="flex flex-col">
<div class="flex flex-col w-3/4">
{#if $page.data.user}
<span class="text-gray-900 text-sm whitespace-nowrap overflow-hidden truncate" data-testid="sidebar-user-name-display">
<span class="text-gray-900 text-sm whitespace-nowrap overflow-hidden truncate w-full" data-testid="sidebar-user-name-display">
{$page.data.user.first_name}
{$page.data.user.last_name}
</span>
<span
class="font-normal text-xs text-gray-600 mr-2 whitespace-nowrap overflow-hidden truncate w-full"
class="font-normal text-xs whitespace-nowrap truncate text-gray-600 mr-2 w-full"
data-testid="sidebar-user-email-display"
>
{$page.data.user.email}
Expand Down
22 changes: 11 additions & 11 deletions frontend/src/lib/utils/crud.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export const URL_MODEL_MAP: ModelMap = {
localFrGender: 'm',
verboseName: 'User group',
verboseNamePlural: 'User groups',
foreignKeyFields: [],
foreignKeyFields: [{ field: 'folder', urlModel: 'folders' }],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Large diff due to formatting (again), only change is here

filters: []
},
'role-assignments': {
Expand Down Expand Up @@ -399,11 +399,11 @@ export const FIELD_COLORED_TAG_MAP: FieldColoredTagMap = {
name: {
key: 'status',
values: {
planned: {text: 'planned', cssClasses: 'badge bg-indigo-300'},
in_progress: {text: 'inProgress', cssClasses: 'badge bg-yellow-300'},
in_review: {text: 'inReview', cssClasses: 'badge bg-cyan-300'},
done: {text: 'done', cssClasses: 'badge bg-lime-300'},
deprecated: {text: 'deprecated', cssClasses: 'badge bg-orange-300'}
planned: { text: 'planned', cssClasses: 'badge bg-indigo-300' },
in_progress: { text: 'inProgress', cssClasses: 'badge bg-yellow-300' },
in_review: { text: 'inReview', cssClasses: 'badge bg-cyan-300' },
done: { text: 'done', cssClasses: 'badge bg-lime-300' },
deprecated: { text: 'deprecated', cssClasses: 'badge bg-orange-300' }
}
}
},
Expand All @@ -423,11 +423,11 @@ export const FIELD_COLORED_TAG_MAP: FieldColoredTagMap = {
name: {
key: 'status',
values: {
planned: {text: 'planned', cssClasses: 'badge bg-indigo-300'},
in_progress: {text: 'inProgress', cssClasses: 'badge bg-yellow-300'},
in_review: {text: 'inReview', cssClasses: 'badge bg-cyan-300'},
done: {text: 'done', cssClasses: 'badge bg-lime-300'},
deprecated: {text: 'deprecated', cssClasses: 'badge bg-orange-300'}
planned: { text: 'planned', cssClasses: 'badge bg-indigo-300' },
in_progress: { text: 'inProgress', cssClasses: 'badge bg-yellow-300' },
in_review: { text: 'inReview', cssClasses: 'badge bg-cyan-300' },
done: { text: 'done', cssClasses: 'badge bg-lime-300' },
deprecated: { text: 'deprecated', cssClasses: 'badge bg-orange-300' }
}
}
},
Expand Down
Loading