From 41814e539ce1fce33ef90b8cffc8b9008cdf7f5d Mon Sep 17 00:00:00 2001 From: AkosuaA Date: Tue, 9 Apr 2024 14:01:31 +0100 Subject: [PATCH] Asap 398 first publish date (#4232) * [ASAP-398] - set date if entry has not been published yet * update test * add condition for existing cases --- .../src/locations/Field.tsx | 21 +++++--- .../src/test/locations/Field.test.tsx | 48 ++++++++++++++----- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/packages/contentful-app-extensions/date-field-as-first-published-at/src/locations/Field.tsx b/packages/contentful-app-extensions/date-field-as-first-published-at/src/locations/Field.tsx index c792f3455f..5fb7c0a61d 100644 --- a/packages/contentful-app-extensions/date-field-as-first-published-at/src/locations/Field.tsx +++ b/packages/contentful-app-extensions/date-field-as-first-published-at/src/locations/Field.tsx @@ -1,14 +1,23 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import { Text } from '@contentful/f36-components'; -import { EntrySys, FieldExtensionSDK } from '@contentful/app-sdk'; -import { useSDK } from '@contentful/react-apps-toolkit'; +import { EntrySys, FieldAppSDK } from '@contentful/app-sdk'; +import { useFieldValue, useSDK } from '@contentful/react-apps-toolkit'; const Field = () => { - const sdk = useSDK(); + const sdk = useSDK(); + const [value, setValue] = useFieldValue(); - const [field] = useState(sdk.field.getValue()); + useEffect(() => { + if (!sdk.entry.getSys().firstPublishedAt) { + setValue(new Date().toISOString()); + } - return {field ?? sdk.entry.getSys().firstPublishedAt}; + if (sdk.entry.getSys().firstPublishedAt && !value) { + setValue(sdk.entry.getSys().firstPublishedAt); + } + }, []); + + return {value}; }; export default Field; diff --git a/packages/contentful-app-extensions/date-field-as-first-published-at/src/test/locations/Field.test.tsx b/packages/contentful-app-extensions/date-field-as-first-published-at/src/test/locations/Field.test.tsx index fea49a1b06..8f74dc8ef2 100644 --- a/packages/contentful-app-extensions/date-field-as-first-published-at/src/test/locations/Field.test.tsx +++ b/packages/contentful-app-extensions/date-field-as-first-published-at/src/test/locations/Field.test.tsx @@ -1,36 +1,60 @@ import '@testing-library/jest-dom'; -import React from 'react'; +import React, { useState } from 'react'; import Field from '../../locations/Field'; import { render, screen, waitFor } from '@testing-library/react'; -import { useSDK } from '@contentful/react-apps-toolkit'; +import { useSDK, useFieldValue } from '@contentful/react-apps-toolkit'; jest.mock('@contentful/react-apps-toolkit', () => ({ useSDK: jest.fn(), + useFieldValue: jest.fn(), })); +beforeEach(() => { + jest.useFakeTimers(); +}); + +afterEach(() => { + jest.useRealTimers(); +}); + describe('Field component', () => { - it('renders the value when its available', () => { + it('updates to current timestamp if entry has not been published', async () => { (useSDK as jest.Mock).mockImplementation(() => ({ - field: { - getValue: jest.fn(() => '2023-04-12T16:05:00.000Z'), + entry: { + getSys: () => ({}), }, })); + (useFieldValue as jest.Mock).mockImplementation(() => { + return useState('2024-01-01T08:08:00.000Z'); + }); render(); - - expect(screen.getByText('2023-04-12T16:05:00.000Z')).toBeInTheDocument(); + expect(screen.getByText(new Date().toISOString())).toBeInTheDocument(); }); - it('renders the value from the system firstPublishedAt when it is not available', () => { + it('does not update to current timestamp if entry has been published', async () => { (useSDK as jest.Mock).mockImplementation(() => ({ - field: { - getValue: jest.fn(), + entry: { + getSys: () => ({ firstPublishedAt: '2024-03-01T08:08:00.000Z' }), }, + })); + (useFieldValue as jest.Mock).mockImplementation(() => { + return useState('2024-01-01T08:08:00.000Z'); + }); + render(); + expect(screen.getByText('2024-01-01T08:08:00.000Z')).toBeInTheDocument(); + }); + + it('updates with firstPublishedAt if entry published but field not set', async () => { + (useSDK as jest.Mock).mockImplementation(() => ({ entry: { - getSys: () => ({ firstPublishedAt: '2020-10-11T16:05:00.000Z' }), + getSys: () => ({ firstPublishedAt: '2024-03-01T08:08:00.000Z' }), }, })); + (useFieldValue as jest.Mock).mockImplementation(() => { + return useState(undefined); + }); render(); - expect(screen.getByText('2020-10-11T16:05:00.000Z')).toBeInTheDocument(); + expect(screen.getByText('2024-03-01T08:08:00.000Z')).toBeInTheDocument(); }); });