Shun Miyazawa 1 год назад
Родитель
Сommit
7c2a97c72a

+ 3 - 14
apps/app/src/features/openai/client/components/AiAssistant/AiAssistantManegementModal.tsx

@@ -15,8 +15,6 @@ import { createAiAssistant } from '../../services/ai-assistant';
 import { useAiAssistantManegementModal } from '../../stores/ai-assistant';
 import { useAiAssistantManegementModal } from '../../stores/ai-assistant';
 import { SelectedPageList } from '../Common/SelectedPageList';
 import { SelectedPageList } from '../Common/SelectedPageList';
 
 
-import { ShareScopeDropdown } from './ShareScopeDropdown';
-
 import styles from './AiAssistantManegementModal.module.scss';
 import styles from './AiAssistantManegementModal.module.scss';
 
 
 const moduleClass = styles['grw-ai-assistant-manegement'] ?? '';
 const moduleClass = styles['grw-ai-assistant-manegement'] ?? '';
@@ -24,20 +22,9 @@ const moduleClass = styles['grw-ai-assistant-manegement'] ?? '';
 const logger = loggerFactory('growi:openai:client:components:AiAssistantManegementModal');
 const logger = loggerFactory('growi:openai:client:components:AiAssistantManegementModal');
 
 
 const AiAssistantManegementModalSubstance = (): JSX.Element => {
 const AiAssistantManegementModalSubstance = (): JSX.Element => {
-  /*
-  *  stores
-  */
   const { open: openPageSelectModal } = usePageSelectModal();
   const { open: openPageSelectModal } = usePageSelectModal();
-
-  /*
-  * States
-  */
   const [selectedPages, setSelectedPages] = useState<SelectedPage[]>([]);
   const [selectedPages, setSelectedPages] = useState<SelectedPage[]>([]);
 
 
-
-  /*
-  *  Methods
-  */
   const clickOpenPageSelectModalHandler = useCallback(() => {
   const clickOpenPageSelectModalHandler = useCallback(() => {
     const onSelected = (page: IPageForItem, isIncludeSubPage: boolean) => {
     const onSelected = (page: IPageForItem, isIncludeSubPage: boolean) => {
       const selectedPageIds = selectedPages.map(selectedPage => selectedPage.page._id);
       const selectedPageIds = selectedPages.map(selectedPage => selectedPage.page._id);
@@ -115,7 +102,9 @@ const AiAssistantManegementModalSubstance = (): JSX.Element => {
               <Label className="mb-0">共有範囲</Label>
               <Label className="mb-0">共有範囲</Label>
               <span className="ms-1 fs-5 material-symbols-outlined text-secondary">help</span>
               <span className="ms-1 fs-5 material-symbols-outlined text-secondary">help</span>
             </div>
             </div>
-            <ShareScopeDropdown />
+            <Input type="select" className="border rounded w-50">
+              <option>自分のみ</option>
+            </Input>
           </FormGroup>
           </FormGroup>
 
 
 
 

+ 0 - 34
apps/app/src/features/openai/client/components/AiAssistant/ShareScopeDropdown.tsx

@@ -1,34 +0,0 @@
-import React from 'react';
-
-import { useTranslation } from 'react-i18next';
-import {
-  UncontrolledDropdown, DropdownToggle, DropdownMenu, DropdownItem,
-} from 'reactstrap';
-
-import { useSWRxUserRelatedGroups } from '~/stores/user';
-
-
-export const ShareScopeDropdown = (): JSX.Element => {
-  const { t } = useTranslation();
-  const { data: userRelatedGroups } = useSWRxUserRelatedGroups();
-
-  return (
-    <UncontrolledDropdown>
-      <DropdownToggle role="button" caret color="secondary" outline className="border-0 ">
-        アクセス権限と同じ範囲
-      </DropdownToggle>
-
-      <DropdownMenu>
-        <DropdownItem>公開ページのみ</DropdownItem>
-        <DropdownItem>自分がアクセスできるページ</DropdownItem>
-        <DropdownItem>自分が所属しているグループがアクセスできるページ</DropdownItem>
-
-        { userRelatedGroups != null && userRelatedGroups.relatedGroups.map(group => (
-          <DropdownItem>
-            { group.item.name }
-          </DropdownItem>
-        ))}
-      </DropdownMenu>
-    </UncontrolledDropdown>
-  );
-};

+ 0 - 10
packages/core/src/interfaces/common.ts

@@ -11,16 +11,6 @@ type ObjectId = Types.ObjectId;
 // Foreign key field
 // Foreign key field
 export type Ref<T> = string | ObjectId | T & { _id: string | ObjectId };
 export type Ref<T> = string | ObjectId | T & { _id: string | ObjectId };
 
 
-export type Populated<T, K extends keyof T> = {
-  [P in keyof T]: P extends K
-    ? T[P] extends null
-      ? null
-      : T[P] extends Ref<infer R>
-        ? R
-        : T[P]
-    : T[P];
-};
-
 export type Nullable<T> = T | null | undefined;
 export type Nullable<T> = T | null | undefined;
 
 
 export const isRef = <T>(obj: unknown): obj is Ref<T> => {
 export const isRef = <T>(obj: unknown): obj is Ref<T> => {