|
|
@@ -1,7 +1,6 @@
|
|
|
import type { IGrowiInfo } from '@growi/core/dist/interfaces';
|
|
|
|
|
|
import type { ICondition } from '../../interfaces/condition';
|
|
|
-import type { IGrowiAppAdditionalInfo } from '../../interfaces/growi-app-info';
|
|
|
import type { IQuestionnaireOrder } from '../../interfaces/questionnaire-order';
|
|
|
import type { IUserInfo } from '../../interfaces/user-info';
|
|
|
import { UserType } from '../../interfaces/user-info';
|
|
|
@@ -42,7 +41,7 @@ const checkUserInfo = (condition: ICondition, userInfo: IUserInfo): boolean => {
|
|
|
return true;
|
|
|
};
|
|
|
|
|
|
-const checkGrowiInfo = (condition: ICondition, growiInfo: IGrowiInfo<IGrowiAppAdditionalInfo>): boolean => {
|
|
|
+const checkGrowiInfo = (condition: ICondition, growiInfo: IGrowiInfo): boolean => {
|
|
|
const { growi: { types, versionRegExps } } = condition;
|
|
|
|
|
|
if (!types.includes(growiInfo.type)) {
|
|
|
@@ -56,7 +55,7 @@ const checkGrowiInfo = (condition: ICondition, growiInfo: IGrowiInfo<IGrowiAppAd
|
|
|
return true;
|
|
|
};
|
|
|
|
|
|
-export const isShowableCondition = (order: IQuestionnaireOrder, userInfo: IUserInfo, growiInfo: IGrowiInfo<IGrowiAppAdditionalInfo>): boolean => {
|
|
|
+export const isShowableCondition = (order: IQuestionnaireOrder, userInfo: IUserInfo, growiInfo: IGrowiInfo): boolean => {
|
|
|
const { condition } = order;
|
|
|
|
|
|
if (!checkUserInfo(condition, userInfo)) {
|