Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Partial fix interface

kruzhambus46b0553dee38
diff --git a/src/pages/Captcha/Settings/CaptchaSettings.tsx b/src/pages/Captcha/Settings/CaptchaSettings.tsx
index 7ed724d9a..fc10f661e 100644
--- a/src/pages/Captcha/Settings/CaptchaSettings.tsx
+++ b/src/pages/Captcha/Settings/CaptchaSettings.tsx
@@ -53,13 +53,12 @@ const tabForNew = 'new'
const tabForInheritance = 'inheritance'
// add to interface IProject new fields isCaptcha
-interface IForm extends ICaptchaProject {
+interface IForm extends Partial<ICaptchaProject> {
isCaptcha?: boolean
- public?: boolean
id: string
name: string
- origins?: string
- ipBlacklist?: string
+ origins?: string | null | string[]
+ ipBlacklist?: string | null | string[]
}
const CaptchaSettings = ({
@@ -143,7 +142,7 @@ const CaptchaSettings = ({
if (!projectSaving) {
setProjectSaving(true)
try {
- const formalisedData: IProject = {
+ const formalisedData: IForm = {
...data,
origins: _isEmpty(data.origins) ? null : _map(_split(data.origins as string, ','), (origin) => {
try {
@@ -158,7 +157,7 @@ const CaptchaSettings = ({
ipBlacklist: _isEmpty(data.ipBlacklist) ? null : _split(data.ipBlacklist as string, ','),
}
if (isSettings) {
- await updateProject(id, formalisedData)
+ await updateProject(id, formalisedData as ICaptchaProject)
newProject(t('project.settings.updated'))
} else {
if (tab === tabForInheritance) {
@@ -166,7 +165,7 @@ const CaptchaSettings = ({
showError('Select projects')
return
}
- await updateProject(formalisedData.id, formalisedData)
+ await updateProject(formalisedData.id, formalisedData as ICaptchaProject)
} else {
await createProject({
id: formalisedData.id,
@@ -392,7 +391,7 @@ const CaptchaSettings = ({
type='text'
label={t('project.settings.origins')}
hint={t('project.settings.originsHint')}
- value={form.origins || ''}
+ value={form.origins as string || ''}
className='mt-4'
onChange={handleInput}
error={beenSubmitted ? errors.origins : null}
@@ -403,7 +402,7 @@ const CaptchaSettings = ({
type='text'
label={t('project.settings.ipBlacklist')}
hint={t('project.settings.ipBlacklistHint')}
- value={form.ipBlacklist || ''}
+ value={form.ipBlacklist as string || ''}
className='mt-4'
onChange={handleInput}
error={beenSubmitted ? errors.ipBlacklist : null}
diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx
index 2cee6a1ea..1322e6aea 100644
--- a/src/pages/Dashboard/Dashboard.tsx
+++ b/src/pages/Dashboard/Dashboard.tsx
@@ -56,8 +56,8 @@ interface IProjectCart {
id?: string
deleteProjectFailed: (message: string) => void
sharedProjects: ISharedProject[]
- setProjectsShareData: (data: ISharedProject, id: string, shared?: boolean) => void
- setUserShareData: (data: ISharedProject, id: string) => void
+ setProjectsShareData: (data: Partial<ISharedProject>, id: string, shared?: boolean) => void
+ setUserShareData: (data: Partial<ISharedProject>, id: string) => void
shared?: boolean
userSharedUpdate: (message: string) => void
sharedProjectError: (message: string) => void
@@ -236,8 +236,8 @@ interface DashboardProps {
error: string
user: IUser
deleteProjectFailed: (error: string) => void
- setProjectsShareData: (data: ISharedProject) => void
- setUserShareData: (data: ISharedProject) => void
+ setProjectsShareData: (data: Partial<ISharedProject>) => void
+ setUserShareData: (data: Partial<ISharedProject>) => void
userSharedUpdate: (message: string) => void
sharedProjectError: (error: string) => void
loadProjects: (take: number, skip: number) => void
diff --git a/src/redux/models/IProject.ts b/src/redux/models/IProject.ts
index 0bf105147..7bc23702b 100644
--- a/src/redux/models/IProject.ts
+++ b/src/redux/models/IProject.ts
@@ -32,36 +32,36 @@ export interface IShareOwnerProject {
export interface IProject {
id: string
name: string
- origins?: string[] | string | null
- ipBlacklist?: string[] | null | string
- active?: boolean
- public?: boolean
- isAnalyticsProject?: boolean
- isCaptchaProject?: boolean
- isCaptchaEnabled?: boolean
- captchaSecretKey?: string | null
- created?: string
+ origins: string[] | string | null
+ ipBlacklist: string[] | null | string
+ active: boolean
+ public: boolean
+ isAnalyticsProject: boolean
+ isCaptchaProject: boolean
+ isCaptchaEnabled: boolean
+ captchaSecretKey: string | null
+ created: string
share?: IShareOwnerProject[]
- isOwner?: boolean
- overall?: IOvervallObject
- live?: number
- uiHidden?: boolean
+ isOwner: boolean
+ overall: IOvervallObject
+ live: number
+ uiHidden: boolean
}
export interface ICaptchaProject {
id: string
name: string
- origins?: string[] | string | null
- ipBlacklist?: string[] | null | string
- active?: boolean
- public?: boolean
- isAnalyticsProject?: boolean
- isCaptchaProject?: boolean
- isCaptchaEnabled?: boolean
- captchaSecretKey?: string | null
- created?: string
- isOwner?: boolean
- overall?: IOvervallObject
- live?: number
- uiHidden?: boolean
+ origins: string[] | string | null
+ ipBlacklist: string[] | null | string
+ active: boolean
+ public: boolean
+ isAnalyticsProject: boolean
+ isCaptchaProject: boolean
+ isCaptchaEnabled: boolean
+ captchaSecretKey: string | null
+ created: string
+ isOwner: boolean
+ overall: IOvervallObject
+ live: number
+ uiHidden: boolean
}