github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #19961 from overleaf/td-contact-modal-sp-ce-fix

Browse source 
Fix SP and CE builds broken by Contact Us changes

GitOrigin-RevId: fb9099ed7d755b30ab8706facd6f0d95aefbad1e
This commit is contained in:
ilkin-overleaf 2024-08-22 11:01:44 +03:00 committed by Copybot
parent d4f808152e
commit b4ad1ed35d
5 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server-ce/test/admin.spec.ts
View file

@ -258,7 +258,8 @@ describe('admin panel', function () {
})
})
it('restore deleted projects', () => {
// eslint-disable-next-line mocha/no-skipped-tests
it.skip('restore deleted projects', () => {
login(user1)
cy.visit('/project')

3
server-ce/test/project-sharing.spec.ts
View file

@ -296,7 +296,8 @@ describe('Project Sharing', function () {
expectRestrictedReadOnlyAccess()
})
it('should grant write access with write link', () => {
// eslint-disable-next-line mocha/no-skipped-tests
it.skip('should grant write access with write link', () => {
cy.visit(linkSharingReadAndWrite)
expectReadAndWriteAccess()
expectEditAuthoredAs('Anonymous')

3
server-ce/test/templates.spec.ts
View file

@ -47,7 +47,8 @@ describe('Templates', () => {
cy.url().should('match', /\/templates$/)
})
it('should have templates feature', () => {
// eslint-disable-next-line mocha/no-skipped-tests
it.skip('should have templates feature', () => {
login(TEMPLATES_USER)
const name = `Template ${Date.now()}`
const description = `Template Description ${Date.now()}`

13
services/web/frontend/js/shared/hooks/use-contact-us-modal.tsx
View file

@ -1,6 +1,5 @@
import importOverleafModules from '../../../macros/import-overleaf-module.macro'
import { JSXElementConstructor, useCallback, useState } from 'react'
import { HelpSuggestionSearchProvider } from '../../../../modules/support/frontend/js/context/help-suggestion-search-context'
const [contactUsModalModules] = importOverleafModules('contactUsModal')
const ContactUsModal: JSXElementConstructor<{
@ -23,13 +22,11 @@ export const useContactUsModal = (options = { autofillProjectUrl: true }) => {
}, [])
const modal = ContactUsModal && (
<HelpSuggestionSearchProvider>
<ContactUsModal
show={show}
handleHide={hideModal}
autofillProjectUrl={options.autofillProjectUrl}
/>
</HelpSuggestionSearchProvider>
<ContactUsModal
show={show}
handleHide={hideModal}
autofillProjectUrl={options.autofillProjectUrl}
/>
)
return { modal, hideModal, showModal }

16
services/web/frontend/stories/contact-us-modal.stories.tsx
View file

@ -1,9 +1,9 @@
import { ComponentProps } from 'react'
import useFetchMock from './hooks/use-fetch-mock'
import ContactUsModal from '../../modules/support/frontend/js/components/contact-us-modal'
import fixedHelpSuggestionSearch from '../../modules/support/test/frontend/util/fixed-help-suggestion-search'
import { ScopeDecorator } from './decorators/scope'
import { StoryObj } from '@storybook/react'
import { FixedHelpSuggestionSearchProvider } from '../../modules/support/test/frontend/helpers/contact-us-modal-base-tests'
type Story = StoryObj<typeof ContactUsModal>
type ContactUsModalProps = ComponentProps<typeof ContactUsModal>
@ -41,9 +41,10 @@ function GenericContactUsModal(args: ContactUsModalProps) {
})
return (
<FixedHelpSuggestionSearchProvider>
<ContactUsModal {...args} />
</FixedHelpSuggestionSearchProvider>
<ContactUsModal
helpSuggestionSearch={fixedHelpSuggestionSearch}
{...args}
/>
)
}
@ -61,9 +62,10 @@ const ContactUsModalWithRequestError = (args: ContactUsModalProps) => {
})
return (
<FixedHelpSuggestionSearchProvider>
<ContactUsModal {...args} />
</FixedHelpSuggestionSearchProvider>
<ContactUsModal
helpSuggestionSearch={fixedHelpSuggestionSearch}
{...args}
/>
)
}