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

Release 2025-02-12 #10322

Merged
merged 9 commits into from
Feb 12, 2025
Merged

Release 2025-02-12 #10322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e92fd3
Improve code readability
brentguf Feb 11, 2025
b8f25ee
Merge pull request #10315 from CitizenLabDotCo/TAN-3821/clean-up-proj…
brentguf Feb 11, 2025
0315985
Better structure for EditDescriptionLinkContent
brentguf Feb 11, 2025
550bb94
Merge pull request #10317 from CitizenLabDotCo/TAN-3827/structure
brentguf Feb 11, 2025
86d8f2f
Fix text overlap with the submission reference on the survey last pag…
EdwinKato Feb 12, 2025
ce2144d
Use dynamic idea
EdwinKato Feb 12, 2025
ecf300d
Merge pull request #10320 from CitizenLabDotCo/fix-alignment-of-last-…
EdwinKato Feb 12, 2025
3c7802d
Update net-imap gem version to 0.5.6
EdwinKato Feb 12, 2025
6800692
Merge pull request #10321 from CitizenLabDotCo/fix-back-bundle-audit-…
EdwinKato Feb 12, 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
2 changes: 1 addition & 1 deletion back/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ GEM
activerecord (>= 7)
net-http (0.6.0)
uri
net-imap (0.5.5)
net-imap (0.5.6)
date
net-protocol
net-pop (0.1.2)
Expand Down
17 changes: 13 additions & 4 deletions front/app/components/Form/Components/Layouts/CLSurveyPageLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ const CLSurveyPageLayout = memo(

const pageVariant = getPageVariant(currentStep, uiPages.length);
const hasPreviousPage = currentStep !== 0;
const showSubmissionReference =
ideaId && pageVariant === 'after-submission' && showIdeaIdInModal;

const draggableDivRef = useRef<HTMLDivElement>(null);
const dragDividerRef = useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -402,7 +404,7 @@ const CLSurveyPageLayout = memo(
height="100%"
mt={isMapPage && isMobileOrSmaller ? '20px' : undefined}
>
<Box h="100%" display="flex">
<Box h="100%" display="flex" flexDirection="column">
{uiPages.map((page, index) => {
const pageElements = extractElementsByOtherOptionLogic(
page,
Expand Down Expand Up @@ -471,10 +473,17 @@ const CLSurveyPageLayout = memo(
)
);
})}
{showSubmissionReference && (
<Box
display="flex"
flexDirection="column"
alignItems="center"
flex="1"
>
<SubmissionReference ideaId={ideaId} />
</Box>
)}
</Box>
{ideaId &&
pageVariant === 'after-submission' &&
showIdeaIdInModal && <SubmissionReference ideaId={ideaId} />}
</Box>
</Box>
</Box>
Expand Down
Loading
Loading