Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix: remove limitation when clone experience #1815

Merged
merged 2 commits into from
Apr 28, 2023
Merged

fix: remove limitation when clone experience #1815

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
5ddb59d
fix: remove limitation when clone experience
abdulhakim2902 Apr 28, 2023
e3a7869
fix: resolve user not found
abdulhakim2902 Apr 28, 2023
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
3 changes: 1 addition & 2 deletions pages/experience/[experienceId]/clone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export const getServerSideProps = wrapper.getServerSideProps(

res.setHeader('set-cookie', [`${COOKIE_INSTANCE_URL}=${apiURL}`]);

const user = (await dispatch(fetchUser())) as unknown as User;
await Promise.all([
dispatch(fetchServer(sessionInstanceURL)),
dispatch(fetchNetwork()),
Expand All @@ -124,7 +125,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
const experience = await ExperienceAPI.getExperienceDetail(experienceId);

if (experience?.visibility === 'selected_user') {
const user = (await dispatch(fetchUser())) as unknown as User;
const found = experience?.selectedUserIds?.find(
e => e.userId === user?.id,
);
Expand All @@ -135,7 +135,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
}

if (experience?.visibility === 'private') {
const user = (await dispatch(fetchUser())) as unknown as User;
if (experience?.createdBy !== user?.id)
return {
notFound: true,
Expand Down
11 changes: 1 addition & 10 deletions src/components/ExperienceList/ExperienceList.container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { ExperienceListRightBar } from './ExperienceListRightBar';
import { useExperienceList } from './hooks/use-experience-list.hook';

import useConfirm from 'components/common/Confirm/use-confirm.hook';
import { useEnqueueSnackbar } from 'components/common/Snackbar/useEnqueueSnackbar.hook';
import { LoadMoreComponent } from 'src/components/atoms/LoadMore/LoadMore';
import {
ExperienceOwner,
Expand Down Expand Up @@ -65,7 +64,6 @@ export const ExperienceListContainer: React.FC<ExperienceListContainerProps> =

const style = useStyles(props);
const router = useRouter();
const enqueueSnackbar = useEnqueueSnackbar();
const confirm = useConfirm();
const user = useSelector<RootState, User | undefined>(
state => state.userState.user,
Expand Down Expand Up @@ -132,14 +130,7 @@ export const ExperienceListContainer: React.FC<ExperienceListContainerProps> =
},
});
} else {
if (totalOwnedExperience >= 10) {
enqueueSnackbar({
message: i18n.t('Experience.List.Alert'),
variant: 'warning',
});
} else {
router.push(`/experience/${experienceId}/clone`);
}
router.push(`/experience/${experienceId}/clone`);
}
};

Expand Down
16 changes: 2 additions & 14 deletions src/components/ExperiencePreview/ExperiencePreview.container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useRouter } from 'next/router';
import { ExperiencePreview } from './ExperiencePreview';
import { useStyles } from './experience.style';

import { useEnqueueSnackbar } from 'components/common/Snackbar/useEnqueueSnackbar.hook';
import { TopNavbarComponent } from 'src/components/atoms/TopNavbar';
import { useExperienceHook } from 'src/hooks/use-experience-hook';
import i18n from 'src/locale';
Expand All @@ -14,12 +13,11 @@ export const ExperiencePreviewContainer: React.FC = () => {
const {
experience,
userExperiences,
userExperiencesMeta,
getExperienceDetail,
subscribeExperience,
unsubscribeExperience,
} = useExperienceHook();
const enqueueSnackbar = useEnqueueSnackbar();

const style = useStyles();
const router = useRouter();
const { experienceId } = router.query;
Expand All @@ -37,17 +35,7 @@ export const ExperiencePreviewContainer: React.FC = () => {
};

const handleCloneExperience = (experienceId: string) => {
const totalOwnedExperience =
userExperiencesMeta.additionalData?.totalOwnedExperience ?? 0;

if (totalOwnedExperience >= 10) {
enqueueSnackbar({
message: i18n.t('Experience.Alert.Max_Exp'),
variant: 'warning',
});
} else {
router.push(`/experience/${experienceId}/clone`);
}
router.push(`/experience/${experienceId}/clone`);
};

const handleEditExperience = (experienceId: string) => {
Expand Down