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

Fixed loading of fans modal categories #994

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Fixed loading of fans modal categories #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 20 additions & 18 deletions ...es/AdminPage/NewStreetcode/ForFansBlock/ForFansAdminModal/ForFansAdminModal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ interface Props {
setOpen: React.Dispatch<React.SetStateAction<boolean>>,
allCategories: SourceCategoryName[],
onChange: (field: string, value: any) => void,
allPersistedSourcesAreSet: boolean,
}

const ForFansModal = ({
character_limit, open, setOpen, allCategories, onChange,
character_limit, open, setOpen, allCategories, onChange, allPersistedSourcesAreSet,
}: Props) => {
const { sourceCreateUpdateStreetcode, sourcesAdminStore } = useMobx();
const editorRef = useRef<Editor | null>(null);
Expand Down Expand Up @@ -82,7 +83,6 @@ const ForFansModal = ({

useEffect(() => {
categoryUpdate.current = sourceCreateUpdateStreetcode.ElementToUpdate;
setCategories(allCategories);
if (categoryUpdate.current && open) {
setEditorContent(categoryUpdate.current.text ?? '');
form.setFieldValue('category', categoryUpdate.current.sourceLinkCategoryId);
Expand All @@ -91,9 +91,24 @@ const ForFansModal = ({
setEditorContent('');
form.setFieldValue('category', '');
}
fetchData();

if (allPersistedSourcesAreSet) {
fetchData();
}
}, [open, sourceCreateUpdateStreetcode]);

useEffect(() => {
if (allCategories.length) {
setCategories([...allCategories].sort((a, b) => a.title.localeCompare(b.title)));
}
}, [allCategories]);

useEffect(() => {
if (allPersistedSourcesAreSet) {
fetchData();
}
}, [allPersistedSourcesAreSet]);

const onSave = (values: any) => {
const elementToUpdate = sourceCreateUpdateStreetcode.ElementToUpdate;
if (elementToUpdate) {
Expand Down Expand Up @@ -134,22 +149,10 @@ const ForFansModal = ({
message.error("Будь ласка, заповніть всі обов'язкові поля та перевірте валідність ваших даних");
}
};
const onDropDownChange = async () => {
if (isAddModalVisible === false) {
const categories = await SourcesApi.getAllCategories();
sourcesAdminStore.setInternalSourceCategories(categories);

const sourceMas: SourceCategoryName[] = categories.map((x) => ({
id: x.id ?? 0,
title: x.title,
}));

sourceMas.sort((a, b) => a.title.localeCompare(b.title));
setCategories(sourceMas);
}
};
const onUpdateStates = async (isNewCatAdded: boolean) => {
if (isNewCatAdded === true) {
const categories = await SourcesApi.getAllNames();
setCategories(categories.sort((a, b) => a.title.localeCompare(b.title)));
const AvailableCats = await getAvailableCategories(true);
setAvailableCategories(AvailableCats);
alert('Категорію успішно додано до списку!');
Expand Down Expand Up @@ -199,7 +202,6 @@ const ForFansModal = ({
key="selectForFansCategory"
className="category-select-input"
onChange={handleAdd}
onDropdownVisibleChange={onDropDownChange}
>
<Select.Option key="addCategory" value="addCategory">
Додати нову категорію...
Expand Down
6 changes: 4 additions & 2 deletions src/features/AdminPage/NewStreetcode/ForFansBlock/ForFansBlock.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import ForFansAdminItem from './ForFansAdminItem/ForFansAdminItem.component';
import ForFansAdminModal from './ForFansAdminModal/ForFansAdminModal.component';

interface Props {
onChange: (field: string, value: any) => void;
onChange: (field: string, value: any) => void,
allPersistedSourcesAreSet: boolean,
}

const ForFansBlock: React.FC<Props> = ({ onChange }) => {
const ForFansBlock: React.FC<Props> = ({ onChange, allPersistedSourcesAreSet }) => {
const { sourceCreateUpdateStreetcode } = useMobx();
const [isModalOpen, setIsModalOpen] = useState(false);
const [categoriesSelect, setCategoriesSelect] = useState<SourceCategoryName[]>([]);
Expand Down Expand Up @@ -59,6 +60,7 @@ const ForFansBlock: React.FC<Props> = ({ onChange }) => {
open={isModalOpen}
setOpen={setIsModalOpen}
onChange={onChange}
allPersistedSourcesAreSet={allPersistedSourcesAreSet}
/>
</div>
);
Expand Down
32 changes: 18 additions & 14 deletions src/features/AdminPage/NewStreetcode/MainNewStreetcode.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ const NewStreetcode = () => {
const navigationString = 'Покинути сторінку? Внесені зміни, можливо, не буде збережено.';
const [fieldChanges, setFieldChanges] = useState({});
const streetcodeType = useRef<StreetcodeType>(StreetcodeType.Person);
const [allPersistedSourcesAreSet, setAllPersistedSourcesAreSet] = useState(false);

const handleFieldChange = (fieldName: any, value: any) => {
setFieldChanges((prevChanges) => ({
Expand Down Expand Up @@ -223,14 +224,15 @@ const NewStreetcode = () => {
.catch((error) => { });
SourcesApi.getCategoriesByStreetcodeId(parseId).then((result) => {
const id = result.map((x) => x.id);
id.map((x) => {
SourcesApi.getCategoryContentByStreetcodeId(parseId, x).then((x) => {
const newSource: StreetcodeCategoryContent = {
sourceLinkCategoryId: x.sourceLinkCategoryId,
streetcodeId: x.streetcodeId,
id: x.id,
text: x.text,
};
const getAllStreetcodeCategoriesContentRequest = result.map((x) => SourcesApi.getCategoryContentByStreetcodeId(parseId, x.id));
Promise.all(getAllStreetcodeCategoriesContentRequest).then((x) => {
const newSources: StreetcodeCategoryContent[] = x.map((e) => ({
sourceLinkCategoryId: e.sourceLinkCategoryId,
streetcodeId: e.streetcodeId,
id: e.id,
text: e.text,
}));
newSources.map((newSource) => {
const existingSource = sourceCreateUpdateStreetcode
.streetcodeCategoryContents.find((s) => s
.sourceLinkCategoryId === newSource.sourceLinkCategoryId);
Expand All @@ -245,6 +247,8 @@ const NewStreetcode = () => {
sourceCreateUpdateStreetcode.setItem(persistedItem);
}
});
}).then(() => {
setAllPersistedSourcesAreSet(true);
});
});
TransactionLinksApi.getByStreetcodeId(parseId)
Expand Down Expand Up @@ -343,10 +347,10 @@ const NewStreetcode = () => {
status: tempStatus,
toponyms: newStreetcodeInfoStore.selectedToponyms,
streetcodeCategoryContents:
JSON.parse(JSON.stringify(sourceCreateUpdateStreetcode.streetcodeCategoryContents))
.map((streetcodeCategoryContent: StreetcodeCategoryContent) => (
{ ...streetcodeCategoryContent, id: 0 }
)),
JSON.parse(JSON.stringify(sourceCreateUpdateStreetcode.streetcodeCategoryContents))
.map((streetcodeCategoryContent: StreetcodeCategoryContent) => (
{ ...streetcodeCategoryContent, id: 0 }
)),
statisticRecords: JSON.parse(JSON.stringify(statisticRecordStore.getStatisticRecordArray))
.map((statisticRecord: StatisticRecord) => (
{
Expand Down Expand Up @@ -424,7 +428,7 @@ const NewStreetcode = () => {
streetcodeCategoryContents: sourceCreateUpdateStreetcode.getCategoryContentsArrayToUpdate
.map((content) => ({ ...content, streetcodeId: parseId })),
streetcodeArts: [...arts.map((streetcodeArt) => ({ ...streetcodeArt, streetcodeId: parseId })),
...streetcodeArtStore.getStreetcodeArtsToDelete].map((streetcodeArt) => ({
...streetcodeArtStore.getStreetcodeArtsToDelete].map((streetcodeArt) => ({
...streetcodeArt,
art: {
...streetcodeArt.art,
Expand Down Expand Up @@ -514,7 +518,7 @@ const NewStreetcode = () => {
<TimelineBlockAdmin onChange={handleFieldChange} />
<ArtGalleryBlock arts={arts} setArts={setArts} onChange={handleFieldChange} />
<RelatedFiguresBlock currentStreetcodeId={parseId} figures={figures} setFigures={setFigures} onChange={handleFieldChange} />
<ForFansBlock onChange={handleFieldChange} />
<ForFansBlock onChange={handleFieldChange} allPersistedSourcesAreSet={allPersistedSourcesAreSet} />
<PartnerBlockAdmin partners={partners} setPartners={setPartners} onChange={handleFieldChange} />
<SubtitleBlock subTitle={subTitle} setSubTitle={setSubTitle} onChange={handleFieldChange} />
<ARBlock onChange={handleFieldChange} />
Expand Down
Loading