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

Fix optimistic effect breaking build

Browse Source
This commit is contained in:
Charles Bochet
2023-11-15 15:57:43 +01:00
parent 6129444c5c
commit f49ddec2f6
9 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
front/src/modules/apollo/optimistic-effect/hooks/useOptimisticEffect.ts
View File

@ -8,8 +8,8 @@ import { isNonEmptyArray } from '@sniptt/guards';
import { useRecoilCallback } from 'recoil';
import { GET_COMPANIES } from '@/companies/graphql/queries/getCompanies';
import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { useGenerateFindManyCustomObjectsQuery } from '@/object-record/utils/useGenerateFindManyCustomObjectsQuery';
import { GET_PEOPLE } from '@/people/graphql/queries/getPeople';
import { GET_API_KEYS } from '@/settings/developers/graphql/queries/getApiKeys';
import {
@ -22,8 +22,11 @@ import { optimisticEffectState } from '../states/optimisticEffectState';
import { OptimisticEffect } from '../types/internal/OptimisticEffect';
import { OptimisticEffectDefinition } from '../types/OptimisticEffectDefinition';
export const useOptimisticEffect = () => {
export const useOptimisticEffect = (objectNameSingular: string) => {
const apolloClient = useApolloClient();
const { findManyQuery } = useFindOneObjectMetadataItem({
objectNameSingular,
});
const registerOptimisticEffect = useRecoilCallback(
({ snapshot, set }) =>
@ -54,12 +57,8 @@ export const useOptimisticEffect = () => {
objectMetadataItem?: ObjectMetadataItem;
}) => {
if (isUsingFlexibleBackend && objectMetadataItem) {
const generatedQuery = useGenerateFindManyCustomObjectsQuery({
objectMetadataItem,
});
const existingData = cache.readQuery({
query: generatedQuery,
query: findManyQuery,
variables,
});
@ -68,7 +67,7 @@ export const useOptimisticEffect = () => {
}
cache.writeQuery({
query: generatedQuery,
query: findManyQuery,
variables,
data: {
[objectMetadataItem.namePlural]: definition.resolver({

2
front/src/modules/object-record/hooks/useCreateOneObjectRecord.ts
View File

@ -24,7 +24,7 @@ const defaultFieldValues: Record<FieldMetadataType, unknown> = {
export const useCreateOneObjectRecord = ({
objectNamePlural,
}: Pick<ObjectMetadataItemIdentifier, 'objectNamePlural'>) => {
const { triggerOptimisticEffects } = useOptimisticEffect();
const { triggerOptimisticEffects } = useOptimisticEffect('CompanyV2');
const {
foundObjectMetadataItem,

2
front/src/modules/object-record/hooks/useObjectRecordTable.ts
View File

@ -14,7 +14,7 @@ import { useFindManyObjectRecords } from './useFindManyObjectRecords';
export const useObjectRecordTable = () => {
const { scopeId: objectNamePlural } = useRecordTable();
const { registerOptimisticEffect } = useOptimisticEffect();
const { registerOptimisticEffect } = useOptimisticEffect('CompanyV2');
const { foundObjectMetadataItem } = useFindOneObjectMetadataItem({
objectNamePlural,

2
front/src/modules/ui/object/record-table/components/RecordTableEffect.tsx
View File

@ -35,7 +35,7 @@ export const RecordTableEffect = ({
const { setRecordTableData } = useRecordTable();
const { tableSortsOrderBySelector, tableFiltersWhereSelector } =
useRecordTableScopedStates();
const { registerOptimisticEffect } = useOptimisticEffect();
const { registerOptimisticEffect } = useOptimisticEffect('CompanyV2');
const tableSortsOrderBy = useRecoilValue(tableSortsOrderBySelector);
const sortsOrderBy = defaults(tableSortsOrderBy, [

2
front/src/pages/companies/Companies.tsx
View File

@ -29,7 +29,7 @@ export const Companies = () => {
recordTableScopeId: 'companies',
});
const upsertTableRowIds = useUpsertTableRowId();
const { triggerOptimisticEffects } = useOptimisticEffect();
const { triggerOptimisticEffects } = useOptimisticEffect('Company');
const handleAddButtonClick = async () => {
const newCompanyId: string = v4();

2
front/src/pages/people/People.tsx
View File

@ -27,7 +27,7 @@ export const People = () => {
recordTableScopeId: 'people',
});
const upsertTableRowIds = useUpsertTableRowId();
const { triggerOptimisticEffects } = useOptimisticEffect();
const { triggerOptimisticEffects } = useOptimisticEffect('Person');
const handleAddButtonClick = async () => {
const newPersonId: string = v4();

2
front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
View File

@ -41,7 +41,7 @@ const StyledInputContainer = styled.div`
export const SettingsDevelopersApiKeyDetail = () => {
const navigate = useNavigate();
const { apiKeyId = '' } = useParams();
const { triggerOptimisticEffects } = useOptimisticEffect();
const { triggerOptimisticEffects } = useOptimisticEffect('ApiKeyV2');
const setGeneratedApi = useGeneratedApiKeys();
const [generatedApiKey] = useRecoilState(

2
front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx
View File

@ -39,7 +39,7 @@ const StyledH1Title = styled(H1Title)`
export const SettingsDevelopersApiKeys = () => {
const navigate = useNavigate();
const { registerOptimisticEffect } = useOptimisticEffect();
const { registerOptimisticEffect } = useOptimisticEffect('ApiKeyV2');
const apiKeysQuery = useGetApiKeysQuery({
onCompleted: () => {
registerOptimisticEffect({

2
front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
View File

@ -19,7 +19,7 @@ import { useInsertOneApiKeyMutation } from '~/generated/graphql';
export const SettingsDevelopersApiKeysNew = () => {
const [insertOneApiKey] = useInsertOneApiKeyMutation();
const { triggerOptimisticEffects } = useOptimisticEffect();
const { triggerOptimisticEffects } = useOptimisticEffect('ApiKeyV2');
const navigate = useNavigate();
const setGeneratedApi = useGeneratedApiKeys();
const [formValues, setFormValues] = useState<{