admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Hot Fix merge conflicts (#523)

Browse Source
This commit is contained in:
Charles Bochet
2023-07-05 16:58:47 +02:00
committed by GitHub
parent 2961fed932
commit 3db15929a5
6 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
front/src/modules/comments/components/CommentThreadRelationPicker.tsx
View File

@ -231,6 +231,7 @@ export function CommentThreadRelationPicker({ commentThread }: OwnProps) {
entitiesToSelect, entitiesToSelect,
filteredSelectedEntities, filteredSelectedEntities,
selectedEntities, selectedEntities,
loading: false, // TODO implement skeleton loading
}} }}
onItemCheckChange={handleCheckItemChange} onItemCheckChange={handleCheckItemChange}
onSearchFilterChange={handleFilterChange} onSearchFilterChange={handleFilterChange}

1
front/src/modules/pipeline-progress/components/NewCompanyBoardCard.tsx
View File

@ -42,6 +42,7 @@ export function NewCompanyBoardCard({ onEntitySelect }: OwnProps) {
entities={{ entities={{
entitiesToSelect: companies.entitiesToSelect, entitiesToSelect: companies.entitiesToSelect,
selectedEntity: companies.selectedEntities[0], selectedEntity: companies.selectedEntities[0],
loading: companies.loading,
}} }}
/> />
); );

1
front/src/modules/relation-picker/components/MultipleEntitySelect.tsx
View File

@ -15,6 +15,7 @@ export type EntitiesForMultipleEntitySelect<
selectedEntities: CustomEntityForSelect[]; selectedEntities: CustomEntityForSelect[];
filteredSelectedEntities: CustomEntityForSelect[]; filteredSelectedEntities: CustomEntityForSelect[];
entitiesToSelect: CustomEntityForSelect[]; entitiesToSelect: CustomEntityForSelect[];
loading: boolean;
}; };
export function MultipleEntitySelect< export function MultipleEntitySelect<

1
front/src/modules/relation-picker/components/SingleEntitySelectBase.tsx
View File

@ -18,6 +18,7 @@ export type EntitiesForSingleEntitySelect<
> = { > = {
selectedEntity: CustomEntityForSelect; selectedEntity: CustomEntityForSelect;
entitiesToSelect: CustomEntityForSelect[]; entitiesToSelect: CustomEntityForSelect[];
loading: boolean;
}; };
export function SingleEntitySelectBase< export function SingleEntitySelectBase<

20
front/src/modules/relation-picker/components/skeletons/CompanyPickerSkeleton.tsx
View File

@ -20,12 +20,16 @@ export const SkeletonEntityName = styled.div`
export function CompanyPickerSkeleton({ count }: OwnProps) { export function CompanyPickerSkeleton({ count }: OwnProps) {
const loadSkeletons = Array(count).fill(1); const loadSkeletons = Array(count).fill(1);
return loadSkeletons.map((_, i) => ( return (
<SkeletonContainer key={i}> <>
<Skeleton width={15} height={15} /> {loadSkeletons.map((_, i) => (
<SkeletonEntityName> <SkeletonContainer key={i}>
<Skeleton height={8} /> <Skeleton width={15} height={15} />
</SkeletonEntityName> <SkeletonEntityName>
</SkeletonContainer> <Skeleton height={8} />
)); </SkeletonEntityName>
</SkeletonContainer>
))}
</>
);
} }

1
front/src/modules/ui/components/table/table-header/FilterDropdownEntitySearchSelect.tsx
View File

@ -78,6 +78,7 @@ export function FilterDropdownEntitySearchSelect({
entities={{ entities={{
entitiesToSelect: entitiesForSelect.entitiesToSelect, entitiesToSelect: entitiesForSelect.entitiesToSelect,
selectedEntity: entitiesForSelect.selectedEntities[0], selectedEntity: entitiesForSelect.selectedEntities[0],
loading: entitiesForSelect.loading,
}} }}
onEntitySelected={handleUserSelected} onEntitySelected={handleUserSelected}
/> />