|
@@ -1,6 +1,6 @@
|
|
|
import React, { useCallback } from 'react';
|
|
import React, { useCallback } from 'react';
|
|
|
|
|
|
|
|
-import { isClient } from '@growi/core';
|
|
|
|
|
|
|
+import { isClient, objectIdUtils } from '@growi/core';
|
|
|
import {
|
|
import {
|
|
|
NextPage, GetServerSideProps, GetServerSidePropsContext,
|
|
NextPage, GetServerSideProps, GetServerSidePropsContext,
|
|
|
} from 'next';
|
|
} from 'next';
|
|
@@ -36,7 +36,6 @@ import {
|
|
|
useCurrentUser, /* useSearchServiceConfigured, */ useIsAclEnabled, useIsMailerSetup, useIsSearchServiceReachable, useSiteUrl,
|
|
useCurrentUser, /* useSearchServiceConfigured, */ useIsAclEnabled, useIsMailerSetup, useIsSearchServiceReachable, useSiteUrl,
|
|
|
} from '~/stores/context';
|
|
} from '~/stores/context';
|
|
|
|
|
|
|
|
-import { isValidObjectId } from '../../../../core/src/utils/objectid-utils';
|
|
|
|
|
import {
|
|
import {
|
|
|
CommonProps, getServerSideCommonProps, useCustomTitle, getNextI18NextConfig,
|
|
CommonProps, getServerSideCommonProps, useCustomTitle, getNextI18NextConfig,
|
|
|
} from '../utils/commons';
|
|
} from '../utils/commons';
|
|
@@ -95,7 +94,7 @@ const AdminMarkdownSettingsPage: NextPage<Props> = (props: Props) => {
|
|
|
let userGroupId;
|
|
let userGroupId;
|
|
|
const [firstPath, secondPath] = pagePathKeys;
|
|
const [firstPath, secondPath] = pagePathKeys;
|
|
|
if (firstPath === 'user-group-detail') {
|
|
if (firstPath === 'user-group-detail') {
|
|
|
- userGroupId = isValidObjectId(secondPath) ? secondPath : undefined;
|
|
|
|
|
|
|
+ userGroupId = objectIdUtils.isValidObjectId(secondPath) ? secondPath : undefined;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// TODO: refactoring adminPagesMap => https://redmine.weseek.co.jp/issues/102694
|
|
// TODO: refactoring adminPagesMap => https://redmine.weseek.co.jp/issues/102694
|