Yuki Takei 8 miesięcy temu
rodzic
commit
a1e76b056c

+ 2 - 3
apps/app/src/features/questionnaire/server/util/condition.ts

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