diff --git a/src/common/XoopsPathRedirect.tsx b/src/common/XoopsPathRedirect.tsx
index dd960ff..7a5132d 100644
--- a/src/common/XoopsPathRedirect.tsx
+++ b/src/common/XoopsPathRedirect.tsx
@@ -1,26 +1,27 @@
-import React from "react";
-import { Navigate, useLocation } from "react-router-dom";
-import { MultiLang } from "../config";
-import PageNotFound from "./lib/PageNotFound";
+import React from 'react';
+
+import { Navigate, useLocation } from 'react-router-dom';
+import { MultiLang } from '../config';
+import PageNotFound from './lib/PageNotFound';
interface Props {
lang: MultiLang;
}
-const XoopsPathRedirect: React.FC = (props: Props) => {
+const XoopsPathRedirect: React.FC = (props) => {
const { lang } = props;
const location = useLocation();
const { pathname } = location;
const getRedirectUrl = () => {
- switch (pathname || "") {
- case "/index.php": {
- return "/";
+ switch (pathname || '') {
+ case '/index.php': {
+ return '/';
}
}
- return "";
+ return '';
};
const url = getRedirectUrl();
- if (url === "") {
+ if (url === '') {
return = (props) => {
+ const { url, title, image: imageNormal, imageHover } = props;
+ const [image, setImage] = React.useState(imageNormal);
-class LinkImage extends Component {
- constructor(props: Props) {
- super(props);
- this.state = {
- image: props.image,
- };
- this.handleMouseOver = this.handleMouseOver.bind(this);
- this.handleMouseOut = this.handleMouseOut.bind(this);
- }
-
- handleMouseOver() {
- const { imageHover } = this.props;
- if (typeof imageHover !== "undefined") {
- this.setState({ image: imageHover });
+ const handleMouseOver = () => {
+ if (imageHover != null) {
+ setImage(imageHover);
}
- }
+ };
- handleMouseOut() {
- const { image: imageNormal, imageHover } = this.props;
- if (typeof imageHover !== "undefined") {
- this.setState({ image: imageNormal });
+ const handleMouseOut = () => {
+ if (imageHover != null) {
+ setImage(imageNormal);
}
- }
+ };
- render() {
- const { url, title } = this.props;
- const image = 
;
- if (url.match(/^(\/|\.)/) === null) {
- return (
-
- {image}
-
- );
- }
+ if (url.match(/^(\/|\.)/) === null) {
return (
-
+
{image}
-
+
);
}
-}
+ return (
+
+ 
+
+ );
+};
export default LinkImage;
diff --git a/src/common/lib/Loading.tsx b/src/common/lib/Loading.tsx
index 6020bfb..30f90a4 100644
--- a/src/common/lib/Loading.tsx
+++ b/src/common/lib/Loading.tsx
@@ -1,10 +1,18 @@
-import React from "react";
-import Spinner from "react-spinner-material";
+import React from 'react';
+
+import Spinner from 'react-spinner-material';
const Loading: React.FC = () => {
return (
-
- = (props: Props) => {
+const NoticeSiteHasBeenArchived: React.FC = (props) => {
const { lang } = props;
- const notice = "[en]This site has been archived since FY2019 and is no longer updated.[/en][ja]このサイトは、2019年度よりアーカイブサイトとして運用されています。[/ja]";
- return = (props) => {
const { lang } = props;
- const location = useLocation();
- const navigate = useNavigate();
- const url = "/";
-
- useEffect(() => {
- let timer: NodeJS.Timeout | null = null;
- if (location.pathname !== "/" && process.env.NODE_ENV === 'production') {
- if (timer === null) {
- timer = setTimeout(() => {
- navigate(url);
- }, 5000);
- }
- }
- return () => {
- if (timer !== null) {
- clearTimeout(timer);
- timer = null;
- }
- };
- }, [location, navigate]);
+ const url = '/';
return (
+
);
};
diff --git a/src/common/lib/NoticeSiteHasBeenArchived.tsx b/src/common/lib/NoticeSiteHasBeenArchived.tsx
index c89fe5b..054ab8d 100644
--- a/src/common/lib/NoticeSiteHasBeenArchived.tsx
+++ b/src/common/lib/NoticeSiteHasBeenArchived.tsx
@@ -1,15 +1,17 @@
-import React from "react";
-import { MultiLang } from "../../config";
-import Functions from "../../functions";
+import React from 'react';
+
+import { MultiLang } from '../../config';
+import Functions from '../../functions';
interface Props {
lang: MultiLang;
}
-const NoticeSiteHasBeenArchived: React.FC{Functions.mlang(notice, lang)}
; + const notice = + '[en]This site has been archived since FY2019 and is no longer updated.[/en][ja]このサイトは、2019年度よりアーカイブサイトとして運用されています。[/ja]'; + return{Functions.mlang(notice, lang)}
; }; export default NoticeSiteHasBeenArchived; diff --git a/src/common/lib/PageNotFound.tsx b/src/common/lib/PageNotFound.tsx index de981dd..dde163d 100644 --- a/src/common/lib/PageNotFound.tsx +++ b/src/common/lib/PageNotFound.tsx @@ -1,8 +1,8 @@ -import React, { useEffect } from "react"; -import { Helmet } from "react-helmet-async"; -import { useLocation, useNavigate } from "react-router-dom"; -import { MultiLang } from "../../config"; -import Functions from "../../functions"; +import React from 'react'; + +import { Helmet } from 'react-helmet-async'; +import { MultiLang } from '../../config'; +import Functions from '../../functions'; interface Props { lang: MultiLang; @@ -10,26 +10,7 @@ interface Props { const PageNotFound: React.FC
@@ -38,7 +19,7 @@ const PageNotFound: React.FC = (props) => {
- = (props: Props) => {
+const UserRankStarImage: React.FC = (props) => {
const { lang, rank, posts } = props;
const findRank = (posts: number) => {
const rank = userRanks.find((userRank) => {
@@ -34,7 +72,7 @@ const UserRankStarImage: React.FC = (props: Props) => {
}
return false;
});
- return typeof rank !== "undefined" ? rank : userRanks[0];
+ return typeof rank !== 'undefined' ? rank : userRanks[0];
};
const userRank = rank > 0 && rank <= 7 ? userRanks[rank - 1] : findRank(posts);
const title = Functions.mlang(userRank.title, lang);
diff --git a/src/common/lib/XoopsCode.tsx b/src/common/lib/XoopsCode.tsx
index c754794..c7b0ab4 100644
--- a/src/common/lib/XoopsCode.tsx
+++ b/src/common/lib/XoopsCode.tsx
@@ -1,8 +1,15 @@
-import ReactHtmlParser, { convertNodeToElement, DomElement, DomNode, Transform } from "@orrisroot/react-html-parser";
-import React from "react";
-import { HashLink } from "react-router-hash-link";
-import { MultiLang } from "../../config";
-import Functions from "../../functions";
+import React from 'react';
+
+import ReactHtmlParser, {
+ convertNodeToElement,
+ DomElement,
+ DomNode,
+ Transform,
+} from '@orrisroot/react-html-parser';
+import { ElementType } from 'htmlparser2';
+import { HashLink } from 'react-router-hash-link';
+import { MultiLang } from '../../config';
+import Functions from '../../functions';
interface Props {
lang: MultiLang;
@@ -16,8 +23,8 @@ interface Props {
const preConvertXCode = (text: string, doxcode: boolean): string => {
if (doxcode) {
- return text.replace(/\[code\](.*)\[\/code\]/gs, (m0, m1) => {
- return "[code]" + Functions.base64Encode(m1) + "[/code]";
+ return text.replace(/\[code\](.*)\[\/code\]/gs, (_: string, m1: string) => {
+ return '[code]' + Functions.base64Encode(m1) + '[/code]';
});
}
return text;
@@ -25,26 +32,42 @@ const preConvertXCode = (text: string, doxcode: boolean): string => {
const postConvertXCode = (text: string, doxcode: boolean, doimage: boolean): string => {
if (doxcode) {
- return text.replace(/\[code\](.*)\[\/code\]/gs, (m0, m1) => {
+ return text.replace(/\[code\](.*)\[\/code\]/gs, (_: string, m1: string) => {
const text = convertXCode(Functions.htmlspecialchars(Functions.base64Decode(m1)), doimage);
- return '";
+ return '';
});
}
return text;
};
const convertClickable = (text: string) => {
- text = text.replace(/(^|[^\]_a-zA-Z0-9-="'/]+)((?:https?|ftp)(?::\/\/[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]+[a-zA-Z0-9=]))/g, (...matches) => {
- return matches[1] + '' + matches[2] + "";
- });
- text = text.replace(/(^|[^\]_a-zA-Z0-9-="'/:.]+)([a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+)/g, (...matches) => {
- return matches[1] + '' + matches[2] + "";
- });
+ text = text.replace(
+ /(^|[^\]_a-zA-Z0-9-="'/]+)((?:https?|ftp)(?::\/\/[-_.!~*'()a-zA-Z0-9;/?:@&=+$,%#]+[a-zA-Z0-9=]))/g,
+ (...matches) => {
+ return (
+ matches[1] +
+ '' +
+ matches[2] +
+ ''
+ );
+ },
+ );
+ text = text.replace(
+ /(^|[^\]_a-zA-Z0-9-="'/:.]+)([a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+)/g,
+ (...matches) => {
+ return matches[1] + '' + matches[2] + '';
+ },
+ );
return text;
};
const convertXCode = (text: string, doimage: boolean): string => {
// TODO: implement
+ if (doimage) {
+ return text;
+ }
return text;
};
@@ -54,17 +77,17 @@ const convertSmiley = (text: string) => {
};
const convertBr = (text: string): string => {
- return text.replace(/(\r?\n|\r)/g, "
"); + return text.replace(/(\r?\n|\r)/g, '
'); }; -const cssConvert = (text: string): object => { - const ret: any = {}; - text.split(";").forEach((line) => { +const cssConvert = (text: string): Record => {
+ const ret: Record = {};
+ text.split(';').forEach((line) => {
const line_ = line.trim();
if (line.length === 0) {
return;
}
- const kv = line_.split(":");
+ const kv = line_.split(':');
const key = Functions.camelCase(kv[0].trim());
const value = kv[1].trim();
ret[key] = value;
@@ -72,19 +95,24 @@ const cssConvert = (text: string): object => {
return ret;
};
-const xoopsTransform: Transform = (node: DomNode, index: number | string, transform?: Transform): React.ReactNode => {
- if (node.type === "tag") {
+const xoopsTransform: Transform = (
+ node: DomNode,
+ index: number | string,
+ transform?: Transform,
+): React.ReactNode => {
+ if (node.type === ElementType.Tag) {
const node_ = node as DomElement;
- if (node_.name === "a") {
- const url = node_.attribs?.["href"] || "/";
- const download = (node_.attribs && node_.attribs["download"]) || "";
- const rel = (node_.attribs && node_.attribs["rel"]) || "";
- const klass = (node_.attribs && node_.attribs["class"]) || "";
- const isFile = download !== "" || /\.(zip|pdf|png|gif|jpg)$/.test(url);
- const isExternal = /external/.test(rel) || /external/.test(klass) || /^(mailto|https?:?\/\/)/.test(url);
+ if (node_.name === 'a') {
+ const url = node_.attribs?.href ?? '/';
+ const download = node_.attribs?.download ?? '';
+ const rel = node_.attribs?.rel ?? '';
+ const className = node_.attribs?.class ?? '';
+ const isFile = download !== '' || /\.(zip|pdf|png|gif|jpg)$/.test(url);
+ const isExternal =
+ /external/.test(rel) || /external/.test(className) || /^(mailto|https?:?\/\/)/.test(url);
if (!isFile && !isExternal) {
- const style = node_.attribs?.["style"] || "";
- const title = node_.attribs?.["title"];
+ const style = node_.attribs?.style || '';
+ const title = node_.attribs?.title;
return (
{node_.children.map((value: DomNode, index: number) => {
@@ -94,15 +122,15 @@ const xoopsTransform: Transform = (node: DomNode, index: number | string, transf
);
}
}
- if (node_.name === "img") {
- const src = (node_.attribs && node_.attribs["src"]) || "";
- node_.attribs["src"] = src.replace("`XOOPS_URL`", process.env.PUBLIC_URL);
+ if (node_.name === 'img') {
+ const src = node_.attribs?.src ?? '';
+ node_.attribs.src = src.replace('`XOOPS_URL`', '/');
return convertNodeToElement(node_, index, transform);
}
}
};
-const XoopsCode: React.FC = (props: Props) => {
+const XoopsCode: React.FC = (props) => {
const { lang } = props;
let text = props.text;
const dohtml = !!props.dohtml;
diff --git a/src/config.ts b/src/config.ts
index 2828022..f98b07d 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,12 +1,12 @@
-const SITE_TITLE = "BSI-NI Brain Atlas";
-const SITE_SLOGAN = "Welcome to BRAIN ATLAS";
-const GOOGLE_ANALYTICS_TRACKING_ID = "";
-const XOONIPS_ITEMTYPES = ["files", "url", "paper", "book"];
+const SITE_TITLE = 'BSI-NI Brain Atlas';
+const SITE_SLOGAN = 'Welcome to BRAIN ATLAS';
+const GOOGLE_ANALYTICS_TRACKING_ID = '';
+const XOONIPS_ITEMTYPES = ['files', 'url', 'paper', 'book'];
-export type MultiLang = "en" | "ja";
+export type MultiLang = 'en' | 'ja';
-export type BrainAtlasType = "degu" | "jm" | "marmoset";
-export const BrainAtlasTypes: ReadonlyArray = ["degu", "jm", "marmoset"];
+export type BrainAtlasType = 'degu' | 'jm' | 'marmoset';
+export const BrainAtlasTypes: readonly BrainAtlasType[] = ['degu', 'jm', 'marmoset'];
const Config = {
SITE_TITLE,
diff --git a/src/custom/CoverPage.tsx b/src/custom/CoverPage.tsx
index 344597e..a90df51 100644
--- a/src/custom/CoverPage.tsx
+++ b/src/custom/CoverPage.tsx
@@ -1,21 +1,25 @@
-import React from "react";
-import { Link } from "react-router-dom";
-import PageNotFound from "../common/lib/PageNotFound";
-import { BrainAtlasType, MultiLang } from "../config";
-import styles from "./CoverPage.module.css";
+import React from 'react';
+
+import { Link } from 'react-router-dom';
+import PageNotFound from '../common/lib/PageNotFound';
+import { BrainAtlasType, MultiLang } from '../config';
+import styles from './CoverPage.module.css';
interface Props {
lang: MultiLang;
type: BrainAtlasType;
}
-const CoverPage: React.FC = (props: Props) => {
+const CoverPage: React.FC = (props) => {
const { lang, type } = props;
const links = [
- { title: "Marmoset-3D Brain Atlas", url: "/marmoset/modules/xoonips/listitem.php?index_id=66" },
- { title: "Marmoset-the MRI Standard Brain", url: "/marmoset/modules/xoonips/listitem.php?index_id=71" },
+ { title: 'Marmoset-3D Brain Atlas', url: '/marmoset/modules/xoonips/listitem.php?index_id=66' },
+ {
+ title: 'Marmoset-the MRI Standard Brain',
+ url: '/marmoset/modules/xoonips/listitem.php?index_id=71',
+ },
];
- if (type !== "marmoset") {
+ if (type !== 'marmoset') {
return = (props: Props) => {
+const RelatedLink: React.FC = (props) => {
const { type } = props;
const links = {
- degu: [{ title: "RIKEN BSI", url: "http://www.brain.riken.jp/" }],
- jm: [{ title: "RIKEN BSI", url: "http://www.brain.riken.jp/" }],
+ degu: [{ title: 'RIKEN BSI', url: 'http://www.brain.riken.jp/' }],
+ jm: [{ title: 'RIKEN BSI', url: 'http://www.brain.riken.jp/' }],
marmoset: [
- { title: "RIKEN BSI", url: "http://www.brain.riken.jp/" },
- { title: "Keio-RIKEN Research centre for Human Congnition", url: "http://human-cognition.keio.ac.jp/english/" },
- { title: "FIRST project", url: "http://www.brain.riken.jp/first-okano/en/index.html" },
- { title: "Press release", url: "http://www.brain.riken.jp/first-okano/en/achievements/2010/papers.html" },
+ { title: 'RIKEN BSI', url: 'http://www.brain.riken.jp/' },
+ {
+ title: 'Keio-RIKEN Research centre for Human Cognition',
+ url: 'http://human-cognition.keio.ac.jp/english/',
+ },
+ { title: 'FIRST project', url: 'http://www.brain.riken.jp/first-okano/en/index.html' },
+ {
+ title: 'Press release',
+ url: 'http://www.brain.riken.jp/first-okano/en/achievements/2010/papers.html',
+ },
],
};
return (
diff --git a/src/custom/SiteIndex.tsx b/src/custom/SiteIndex.tsx
index 5a43edf..f8e7616 100644
--- a/src/custom/SiteIndex.tsx
+++ b/src/custom/SiteIndex.tsx
@@ -1,14 +1,15 @@
-import React from "react";
-import { Link } from "react-router-dom";
-import NoticeSiteHasBeenArchived from "../common/lib/NoticeSiteHasBeenArchived";
-import { MultiLang } from "../config";
-import styles from "./SiteIndex.module.css";
+import React from 'react';
+
+import { Link } from 'react-router-dom';
+import NoticeSiteHasBeenArchived from '../common/lib/NoticeSiteHasBeenArchived';
+import { MultiLang } from '../config';
+import styles from './SiteIndex.module.css';
interface Props {
lang: MultiLang;
}
-const SiteIndex: React.FC = (props: Props) => {
+const SiteIndex: React.FC = (props) => {
const { lang } = props;
return (
Page Not Found
The page you were trying to access doesn't exist.
+The page you were trying to access doesn't exist.
If the page does not automatically reload, please click here
diff --git a/src/common/lib/UserRankStarImage.tsx b/src/common/lib/UserRankStarImage.tsx index acba8d9..ec30bca 100644 --- a/src/common/lib/UserRankStarImage.tsx +++ b/src/common/lib/UserRankStarImage.tsx @@ -1,13 +1,15 @@ -import React from "react"; -import { MultiLang } from "../../config"; -import Functions from "../../functions"; -import imageRank2 from "../assets/images/rank3dbf8e94a6f72.gif"; -import imageRank3 from "../assets/images/rank3dbf8e9e7d88d.gif"; -import imageRank4 from "../assets/images/rank3dbf8ea81e642.gif"; -import imageRank5 from "../assets/images/rank3dbf8eb1a72e7.gif"; -import imageRank6 from "../assets/images/rank3dbf8edf15093.gif"; -import imageRank7 from "../assets/images/rank3dbf8ee8681cd.gif"; -import imageRank1 from "../assets/images/rank3e632f95e81ca.gif"; +import React from 'react'; + +import { MultiLang } from '../../config'; +import Functions from '../../functions'; + +import imageRank2 from '../assets/images/rank3dbf8e94a6f72.gif'; +import imageRank3 from '../assets/images/rank3dbf8e9e7d88d.gif'; +import imageRank4 from '../assets/images/rank3dbf8ea81e642.gif'; +import imageRank5 from '../assets/images/rank3dbf8eb1a72e7.gif'; +import imageRank6 from '../assets/images/rank3dbf8edf15093.gif'; +import imageRank7 from '../assets/images/rank3dbf8ee8681cd.gif'; +import imageRank1 from '../assets/images/rank3e632f95e81ca.gif'; interface Props { lang: MultiLang; @@ -16,16 +18,52 @@ interface Props { } const userRanks = [ - { title: "[en]Just popping in[/en][ja]新米[/ja]", min: 0, max: 20, special: false, image: imageRank1 }, - { title: "[en]Not too shy to talk[/en][ja]半人前[/ja]", min: 21, max: 40, special: false, image: imageRank2 }, - { title: "[en]Quite a regular[/en][ja]常連[/ja]", min: 41, max: 70, special: false, image: imageRank3 }, - { title: "[en]Just can't stay away[/en][ja]一人前[/ja]", min: 71, max: 150, special: false, image: imageRank4 }, - { title: "[en]Home away from home[/en][ja]長老[/ja]", min: 151, max: 10000, special: false, image: imageRank5 }, - { title: "[en]Moderator[/en][ja]モデレータ[/ja]", min: 0, max: 0, special: true, image: imageRank6 }, - { title: "[en]Webmaster[/en][ja]管理人[/ja]", min: 0, max: 0, special: true, image: imageRank7 }, + { + title: '[en]Just popping in[/en][ja]新米[/ja]', + min: 0, + max: 20, + special: false, + image: imageRank1, + }, + { + title: '[en]Not too shy to talk[/en][ja]半人前[/ja]', + min: 21, + max: 40, + special: false, + image: imageRank2, + }, + { + title: '[en]Quite a regular[/en][ja]常連[/ja]', + min: 41, + max: 70, + special: false, + image: imageRank3, + }, + { + title: "[en]Just can't stay away[/en][ja]一人前[/ja]", + min: 71, + max: 150, + special: false, + image: imageRank4, + }, + { + title: '[en]Home away from home[/en][ja]長老[/ja]', + min: 151, + max: 10000, + special: false, + image: imageRank5, + }, + { + title: '[en]Moderator[/en][ja]モデレータ[/ja]', + min: 0, + max: 0, + special: true, + image: imageRank6, + }, + { title: '[en]Webmaster[/en][ja]管理人[/ja]', min: 0, max: 0, special: true, image: imageRank7 }, ]; -const UserRankStarImage: React.FC' + text + "' + text + '"); + return text.replace(/(\r?\n|\r)/g, '
'); }; -const cssConvert = (text: string): object => { - const ret: any = {}; - text.split(";").forEach((line) => { +const cssConvert = (text: string): Record
@@ -29,7 +30,10 @@ const SiteIndex: React.FC = (props: Props) => {
-
+
Japanese Macaque Monkey
diff --git a/src/database/Database.tsx b/src/database/Database.tsx
index 048c201..be90913 100644
--- a/src/database/Database.tsx
+++ b/src/database/Database.tsx
@@ -1,88 +1,102 @@
-import React from "react";
-import { Helmet } from "react-helmet-async";
-import { Route, Routes, useLocation } from "react-router-dom";
-import PageNotFound from "../common/lib/PageNotFound";
-import { BrainAtlasType, MultiLang } from "../config";
-import Functions from "../functions";
-import styles from "./Database.module.css";
-import DatabaseAdvancedSearch from "./DatabaseAdvancedSearch";
-import DatabaseDetailItem from "./DatabaseDetailItem";
-import DatabaseSearchByAdvancedKeyword from "./DatabaseSearchByAdvancedKeyword";
-import DatabaseSearchByIndexId from "./DatabaseSearchByIndexId";
-import DatabaseSearchByItemType from "./DatabaseSearchByItemType";
-import DatabaseSearchByKeyword from "./DatabaseSearchByKeyword";
-import DatabaseTop from "./DatabaseTop";
-import { INDEX_ID_PUBLIC } from "./lib/IndexUtil";
+import React from 'react';
+
+import { Helmet } from 'react-helmet-async';
+import { Route, Routes, useLocation } from 'react-router-dom';
+import PageNotFound from '../common/lib/PageNotFound';
+import { BrainAtlasType, MultiLang } from '../config';
+import Functions from '../functions';
+import styles from './Database.module.css';
+import DatabaseAdvancedSearch from './DatabaseAdvancedSearch';
+import DatabaseDetailItem from './DatabaseDetailItem';
+import DatabaseSearchByAdvancedKeyword from './DatabaseSearchByAdvancedKeyword';
+import DatabaseSearchByIndexId from './DatabaseSearchByIndexId';
+import DatabaseSearchByItemType from './DatabaseSearchByItemType';
+import DatabaseSearchByKeyword from './DatabaseSearchByKeyword';
+import DatabaseTop from './DatabaseTop';
+import { INDEX_ID_PUBLIC } from './lib/IndexUtil';
interface Props {
lang: MultiLang;
type: BrainAtlasType;
}
-const ItemDetail: React.FC = (props: Props) => {
+const ItemDetail: React.FC = (props) => {
const { lang, type } = props;
const location = useLocation();
const params = new URLSearchParams(location.search);
- const itemId_ = params.get("item_id") || "";
+ const itemId_ = params.get('item_id') ?? '';
const itemId = /^\d+$/.test(itemId_) ? parseInt(itemId_, 10) : 0;
- const doi = params.get("id") || "";
+ const doi = params.get('id') ?? '';
return = (props: Props) => {
+const ItemList: React.FC = (props) => {
const { lang, type } = props;
const location = useLocation();
const params = new URLSearchParams(location.search);
- const id = params.get("index_id") || "";
+ const id = params.get('index_id') ?? '';
const indexId = /^\d+$/.test(id) ? parseInt(id, 10) : INDEX_ID_PUBLIC;
return = (props: Props) => {
+const ItemSelect: React.FC = (props) => {
const { lang, type } = props;
const location = useLocation();
const params = new URLSearchParams(location.search);
- const op = params.get("op") || "";
+ const op = params.get('op') ?? '';
switch (op) {
- case "itemtypesearch": {
- const searchItemtype = params.get("search_itemtype") || "";
+ case 'itemtypesearch': {
+ const searchItemtype = params.get('search_itemtype') ?? '';
const match = searchItemtype.match(/^xnp([a-z]+)$/);
- const itemType = match !== null ? match[1] : "";
- return = (props: Props) => {
+const Database: React.FC = (props) => {
const { lang, type } = props;
return (
- {Functions.mlang("[en]Database[/en][ja]データベース[/ja]", lang)} - {Functions.siteTitle(lang)}
+ {Functions.mlang('[en]Database[/en][ja]データベース[/ja]', lang)} -{' '}
+ {Functions.siteTitle(lang)}
diff --git a/src/database/DatabaseAdvancedSearch.tsx b/src/database/DatabaseAdvancedSearch.tsx
index 4df913c..64d6a63 100644
--- a/src/database/DatabaseAdvancedSearch.tsx
+++ b/src/database/DatabaseAdvancedSearch.tsx
@@ -1,63 +1,47 @@
-import React from "react";
-import { useNavigate } from "react-router-dom";
-import Config, { BrainAtlasType, MultiLang } from "../config";
-import Functions from "../functions";
-import ItemType from "./item-type";
-import AdvancedSearchQuery from "./lib/AdvancedSearchQuery";
-import ItemUtil from "./lib/ItemUtil";
+import React from 'react';
-interface PropsFC {
+import { useNavigate } from 'react-router-dom';
+import Config, { BrainAtlasType, MultiLang } from '../config';
+import Functions from '../functions';
+import ItemType from './item-type';
+import AdvancedSearchQuery from './lib/AdvancedSearchQuery';
+import ItemUtil from './lib/ItemUtil';
+
+interface Props {
lang: MultiLang;
type: BrainAtlasType;
}
-interface Props extends PropsFC {
- navigate: any;
-}
+const DatabaseAdvancedSearch: React.FC = (props) => {
+ const { lang, type } = props;
+ const query = new AdvancedSearchQuery();
+ const navigate = useNavigate();
-class DatabaseAdvancedSearch extends React.Component {
- private query: AdvancedSearchQuery = new AdvancedSearchQuery();
-
- constructor(props: Props) {
- super(props);
- this.handleClickSearchButton = this.handleClickSearchButton.bind(this);
- }
-
- handleClickSearchButton() {
- const { type, navigate } = this.props;
- if (!this.query.empty()) {
- const url = ItemUtil.getSearchByAdvancedKeywordsUrl(type, this.query);
+ const handleClickSearchButton = () => {
+ if (!query.empty()) {
+ const url = ItemUtil.getSearchByAdvancedKeywordsUrl(type, query);
navigate(url);
}
- }
+ };
- render() {
- const { lang } = this.props;
-
- return (
-
- = (props) => {
+ const { lang, type, id, doi } = props;
-class DatabaseDetailItem extends React.Component {
- constructor(props: Props) {
- super(props);
- this.state = {
- loading: true,
- item: null,
- };
- }
+ const [loading, setLoading] = React.useState(true);
+ const [item, setItem] = React.useState- (null);
- componentDidMount() {
- this.updateItem();
- }
-
- componentDidUpdate(prevProps: Props, prevState: State) {
- const { id, doi } = this.props;
- if (id !== prevProps.id || doi !== prevProps.doi) {
- this.updateItem();
- }
- }
-
- updateItem() {
- const { id, doi, type } = this.props;
- if (doi !== "") {
+ React.useEffect(() => {
+ if (doi !== '') {
ItemUtil.getByDoi(type, doi, (item) => {
- this.setState({ loading: false, item });
+ setItem(item);
+ setLoading(false);
});
} else if (id !== 0) {
ItemUtil.get(type, id, (item) => {
- this.setState({ loading: false, item });
+ setItem(item);
+ setLoading(false);
});
+ } else {
+ setLoading(true);
}
+ }, [type, id, doi]);
+
+ if (loading) {
+ return
-
- {Functions.mlang(this.state.item.title, lang)} - {Functions.mlang("[en]Database[/en][ja]データベース[/ja]", lang)} - {Functions.siteTitle(lang)}
-
-
-
-
+
+ {Functions.mlang(item.title, lang)} -{' '}
+ {Functions.mlang('[en]Database[/en][ja]データベース[/ja]', lang)} -{' '}
+ {Functions.siteTitle(lang)}
+
+
+
+ {
- constructor(props: Props) {
- super(props);
- const search = props.location.search;
- const query = ItemUtil.getAdvancedSearchQueryByQuery(search);
- this.state = { search, query };
- this.searchFunc = this.searchFunc.bind(this);
- }
-
- static getDerivedStateFromProps(nextProps: Props, prevState: State) {
- const search = nextProps.location.search;
- if (prevState.search !== search) {
- const query = ItemUtil.getAdvancedSearchQueryByQuery(search);
- return { search, query };
- }
- return null;
- }
-
- getUrl() {
- const { type } = this.props;
- return ItemUtil.getSearchByAdvancedKeywordsUrl(type, this.state.query);
- }
-
- searchFunc(condition: SortCondition, func: SearchCallbackFunc) {
- const { type } = this.props;
- ItemUtil.getListByAdvancedSearchQuery(type, this.state.query, condition, func);
- }
-
- render() {
- const { lang, type } = this.props;
- const baseUrl = this.getUrl();
- return (
- = (props: PropsFC) => {
+const DatabaseSearchByAdvancedKeyword: React.FC = (props) => {
const { lang, type } = props;
- return {
- constructor(props: Props) {
- super(props);
- this.searchFunc = this.searchFunc.bind(this);
- }
+const DatabaseSearchByIndexId: React.FC = (props) => {
+ const { lang, type, indexId } = props;
- getUrl() {
- const { type, indexId } = this.props;
- if (indexId === 0) {
- return "/";
- }
- return IndexUtil.getUrl(type, indexId);
- }
+ const [notFound, setNotFound] = React.useState(false);
+ const [index, setIndex] = React.useState(null);
+ const [parents, setParents] = React.useState<{ title: string; node: React.ReactNode }>({
+ title: '',
+ node: null,
+ });
- searchFunc(condition: SortCondition, func: SearchCallbackFunc) {
- const { type, indexId } = this.props;
+ const searchFunc = (condition: SortCondition, func: SearchCallbackFunc) => {
if (indexId === 0) {
const res = { total: 0, data: [] };
func(res);
} else {
ItemUtil.getListByIndexId(type, indexId, condition, func);
}
+ };
+
+ React.useEffect(() => {
+ IndexUtil.get(type, indexId, (index) => {
+ setIndex(index);
+ if (index == null) {
+ setNotFound(true);
+ } else {
+ IndexUtil.getParents(type, indexId, (pIndexes) => {
+ const parents = pIndexes.map((index: Index) => {
+ const url: string = IndexUtil.getUrl(type, index.id);
+ const title = Functions.mlang(index.title, lang);
+ return (
+
+ / {title}{' '}
+
+ );
+ });
+ const title = pIndexes
+ .map((index) => {
+ return '/' + Functions.mlang(index.title, lang);
+ })
+ .join('');
+ setParents({ title: title, node: parents });
+ });
+ }
+ });
+ }, [indexId, lang, type]);
+
+ if (notFound) {
+ return
- / {title}{" "}
-
- );
- });
- const title = pIndexes
- .map((value) => {
- return "/" + Functions.mlang(value.title, lang);
- })
- .join("");
- return (
- {
- constructor(props: Props) {
- super(props);
- this.searchFunc = this.searchFunc.bind(this);
- }
+const DatabaseSearchByItemType: React.FC = (props) => {
+ const { lang, itemType, subItemType, type } = props;
- searchFunc(condition: SortCondition, func: SearchCallbackFunc) {
- const { itemType, subItemType, type } = this.props;
- if (itemType === "") {
+ const searchFunc = (condition: SortCondition, func: SearchCallbackFunc) => {
+ if (itemType === '') {
const res = { total: 0, data: [] };
func(res);
} else {
ItemUtil.getListByItemType(type, itemType, subItemType, condition, func);
}
- }
+ };
- getUrl() {
- const { itemType, subItemType, type } = this.props;
- let url = ItemUtil.getItemTypeSearchUrl(type, itemType, subItemType);
- return url;
- }
+ const baseUrl = ItemUtil.getItemTypeSearchUrl(type, itemType, subItemType);
- render() {
- const { lang, type } = this.props;
- const baseUrl = this.getUrl();
- return (
- = (props) => {
+ const { lang, type } = props;
-interface State {
- type: KeywordSearchType;
- keyword: string;
-}
+ const location = useLocation();
+ const query = ItemUtil.getSearchKeywordByQuery(location.search);
-class DatabaseSearchByKeyword extends React.Component {
- constructor(props: Props) {
- super(props);
- const { location } = props;
- const { type, keyword } = ItemUtil.getSearchKeywordByQuery(location.search);
- this.state = { type, keyword };
- this.searchFunc = this.searchFunc.bind(this);
- }
-
- static getDerivedStateFromProps(nextProps: Props, prevState: State) {
- const { type, keyword } = ItemUtil.getSearchKeywordByQuery(nextProps.location.search);
- if (prevState.type !== type || prevState.keyword !== keyword) {
- return { type, keyword };
- }
- return null;
- }
-
- getUrl() {
- const { type } = this.props;
- return ItemUtil.getSearchByKeywordUrl(type, this.state.type, this.state.keyword);
- }
-
- searchFunc(condition: SortCondition, func: SearchCallbackFunc) {
- const { type } = this.props;
- if (this.state.keyword === "") {
+ const searchFunc = (condition: SortCondition, func: SearchCallbackFunc) => {
+ if (query.keyword === '') {
const res = { total: 0, data: [] };
func(res);
} else {
- ItemUtil.getListByKeyword(type, this.state.type, this.state.keyword, condition, func);
+ ItemUtil.getListByKeyword(type, query.type, query.keyword, condition, func);
}
- }
+ };
- render() {
- const { lang, type } = this.props;
- const baseUrl = this.getUrl();
- return (
- = (props: PropsFC) => {
- const { lang, type } = props;
- return = (props: Props) => {
+const DatabaseTop: React.FC = (props) => {
const { lang, type } = props;
const types: string[][] = [];
const len = Config.XOONIPS_ITEMTYPES.length;
@@ -26,7 +27,9 @@ const DatabaseTop: React.FC = (props: Props) => {
{value.map((itemType, idx) => {
return (
- {itemType !== "" &&
);
})}
diff --git a/src/database/DatabaseXoopsPathRedirect.tsx b/src/database/DatabaseXoopsPathRedirect.tsx
index 6678bbc..9e095d2 100644
--- a/src/database/DatabaseXoopsPathRedirect.tsx
+++ b/src/database/DatabaseXoopsPathRedirect.tsx
@@ -1,121 +1,123 @@
-import React from "react";
-import { Navigate, useLocation } from "react-router-dom";
-import PageNotFound from "../common/lib/PageNotFound";
-import { MultiLang } from "../config";
-import Functions from "../functions";
+import React from 'react';
+
+import { Navigate, useLocation } from 'react-router-dom';
+import PageNotFound from '../common/lib/PageNotFound';
+import { MultiLang } from '../config';
+import Functions from '../functions';
interface Props {
lang: MultiLang;
}
-const DatabaseXoopsPathRedirect: React.FC = (props: Props) => {
+const DatabaseXoopsPathRedirect: React.FC = (props) => {
const { lang } = props;
+ const location = useLocation();
const getRedirectUrl = (): string => {
- const location = useLocation();
- const pathname = location.pathname || "";
+ const pathname = location.pathname || '';
const query = new URLSearchParams(location.search);
- const search = new RegExp("^/modules/xoonips(?:/+(.*))?$");
+ const search = new RegExp('^/modules/xoonips(?:/+(.*))?$');
const matches = pathname.match(search);
if (matches === null) {
- return "";
+ return '';
}
- const path = matches[1] || "";
+ const path = matches[1] || '';
switch (path) {
- case "":
- case "index.php": {
- return "/database";
+ case '':
+ case 'index.php': {
+ return '/database';
}
- case "detail.php": {
- const id = query.get("id");
+ case 'detail.php': {
+ const id = query.get('id');
if (id !== null) {
- return "/database/item/id/" + Functions.escape(id);
+ return '/database/item/id/' + Functions.escape(id);
}
- const itemId = query.get("item_id");
- if (itemId !== null && itemId.match(/^\d+$/) !== null) {
- return "/database/item/" + Functions.escape(itemId);
+ const itemId = query.get('item_id');
+ if (itemId?.match(/^\d+$/) != null) {
+ return '/database/item/' + Functions.escape(itemId);
}
- return "";
+ return '';
}
- case "listitem.php": {
- const indexId = query.get("index_id");
- if (indexId !== null && indexId.match(/^\d+$/) !== null) {
+ case 'listitem.php': {
+ const indexId = query.get('index_id');
+ if (indexId?.match(/^\d+$/) != null) {
const params = new URLSearchParams();
- const map: any = {
- orderby: { key: "orderby", isNumber: false },
- order_dir: { key: "order_dir", isNumber: true },
- itemcount: { key: "itemcount", isNumber: true },
- page: { key: "page", isNumber: true },
- };
- for (let k in map) {
- const v = query.get(k);
- if (v === null || v.length === 0) {
- continue;
+ [
+ { qKey: 'orderby', pKey: 'orderby', isNumber: false },
+ { qKey: 'order_dir', pKey: 'order_dir', isNumber: true },
+ { qKey: 'itemcount', pKey: 'itemcount', isNumber: true },
+ { qKey: 'page', pKey: 'page', isNumber: true },
+ ].forEach(({ qKey, pKey, isNumber }) => {
+ const v = query.get(qKey);
+ if (v == null || v.length === 0) {
+ return;
}
- if (map[k].isNumber && v.match(/^\d+$/) !== null) {
- continue;
+ if (isNumber && v.match(/^\d+$/) != null) {
+ return;
}
- params.set(map[k].key, v);
- }
+ params.set(pKey, v);
+ });
const paramStr = params.toString();
- return "/database/list/" + Functions.escape(indexId) + (paramStr.length > 0 ? "?" + paramStr : "");
+ return (
+ `/database/list/${Functions.escape(indexId)}` +
+ (paramStr.length > 0 ? `?${paramStr}` : '')
+ );
}
break;
}
- case "itemselect.php": {
- const op = query.get("op");
+ case 'itemselect.php': {
+ const op = query.get('op');
if (op === null) {
break;
}
switch (op) {
- case "quicksearch": {
- const keyword = query.get("keyword");
- const itemType = query.get("search_itemtype");
- if (keyword === null || itemType === null || keyword === "") {
- return "";
+ case 'quicksearch': {
+ const keyword = query.get('keyword');
+ const itemType = query.get('search_itemtype');
+ if (keyword === null || itemType === null || keyword === '') {
+ return '';
}
- const type = itemType.replace("xnp", "");
- if (itemType !== "basic" && itemType !== "all" && itemType.match(/^xnp.+/) === null) {
- return "";
+ const type = itemType.replace('xnp', '');
+ if (itemType !== 'basic' && itemType !== 'all' && itemType.match(/^xnp.+/) === null) {
+ return '';
}
const params = new URLSearchParams({ type, keyword });
- const map: any = {
- orderby: { key: "orderby", isNumber: false },
- orderdir: { key: "order_dir", isNumber: true },
- item_per_page: { key: "itemcount", isNumber: true },
- page: { key: "page", isNumber: true },
- };
- for (let k in map) {
- const v = query.get(k);
- if (v === null || v.length === 0) {
- continue;
+ [
+ { qKey: 'orderby', pKey: 'orderby', isNumber: false },
+ { qKey: 'orderdir', pKey: 'order_dir', isNumber: true },
+ { qKey: 'item_per_page', pKey: 'itemcount', isNumber: true },
+ { qKey: 'page', pKey: 'page', isNumber: true },
+ ].forEach(({ qKey, pKey, isNumber }) => {
+ const v = query.get(qKey);
+ if (v == null || v.length === 0) {
+ return;
}
- if (map[k].isNumber && v.match(/^\d+$/) !== null) {
- continue;
+ if (isNumber && v.match(/^\d+$/) != null) {
+ return;
}
- params.set(map[k].key, v);
- }
- return "/database/search?" + params.toString();
+ params.set(pKey, v);
+ });
+ return '/database/search?' + params.toString();
}
- case "itemtypesearch": {
- const itemType = query.get("search_itemtype");
- if (itemType === null || itemType.match(/^xnp.+/) === null) {
- return "";
+ case 'itemtypesearch': {
+ const itemType = query.get('search_itemtype');
+ if (itemType?.match(/^xnp.+/) == null) {
+ return '';
}
- const type = itemType.replace("xnp", "");
- return "/database/search/itemtype/" + Functions.escape(type);
+ const type = itemType.replace('xnp', '');
+ return '/database/search/itemtype/' + Functions.escape(type);
}
- case "itemsubtypesearch": {
- let type = "";
- let subtype = "";
+ case 'itemsubtypesearch': {
+ let type = '';
+ let subtype = '';
query.forEach((v, k) => {
if (k.match(/^xnp[a-z]+$/) !== null && !!v) {
- type = k.replace("xnp", "");
+ type = k.replace('xnp', '');
return;
}
});
- if (type === "") {
- return "";
+ if (type === '') {
+ return '';
}
query.forEach((v, k) => {
if (k.match(`^xnp${type}_.+$`) !== null && !!v) {
@@ -123,23 +125,28 @@ const DatabaseXoopsPathRedirect: React.FC = (props: Props) => {
return;
}
});
- if (subtype === "") {
- return "";
+ if (subtype === '') {
+ return '';
}
- return "/database/search/itemtype/" + Functions.escape(type) + "/" + Functions.escape(subtype);
+ return (
+ '/database/search/itemtype/' +
+ Functions.escape(type) +
+ '/' +
+ Functions.escape(subtype)
+ );
}
}
- return "";
+ return '';
}
- case "advanced_search.php": {
- return "/database/advanced";
+ case 'advanced_search.php': {
+ return '/database/advanced';
}
}
- return "";
+ return '';
};
const url = getRedirectUrl();
- if (url === "") {
+ if (url === '') {
return = (props) => {
+ const { lang, type } = props;
+ const navigate = useNavigate();
-class IndexTree extends React.Component {
- constructor(props: Props) {
- super(props);
- this.handleClickOpenAll = this.handleClickOpenAll.bind(this);
- this.handleClickCloseAll = this.handleClickCloseAll.bind(this);
- this.handleExpand = this.handleExpand.bind(this);
- this.handleSelect = this.handleSelect.bind(this);
- const res = this.load();
- this.state = {
- tree: res.elements,
- expandableKeys: res.keys,
- expandedKeys: res.expandedKeys,
- selectedKeys: [],
- };
- }
+ const [tree, setTree] = React.useState([]);
+ const [keys, setKeys] = React.useState([]);
+ const [expandedKeys, setExpandedKeys] = React.useState([]);
+ const [selectedKeys, setSelectedKeys] = React.useState([]);
- load() {
- const { lang, type } = this.props;
- let keys: string[] = [];
- let eKeys: string[] = [];
- const makeTreeNode = (index: Index, depth: number): DataNode => {
- const title = Functions.mlang(index.title, lang) + (index.numOfItems > 0 ? " (" + index.numOfItems + ")" : "");
- const children = IndexUtil.getChildren(type, index.id);
- if (children.length === 0) {
- return { key: String(index.id), title: title };
- }
- const childTreeNodes = children.map((value: Index) => {
- return makeTreeNode(value, depth + 1);
+ React.useEffect(() => {
+ const tree: DataNode[] = [];
+ const keys: string[] = [];
+ const eKeys: string[] = [];
+ const makeTreeNode = (index: Index, depth: number, func: (node: DataNode) => void): void => {
+ const title =
+ Functions.mlang(index.title, lang) +
+ (index.numOfItems > 0 ? ' (' + index.numOfItems + ')' : '');
+ IndexUtil.getChildren(type, index.id, (children) => {
+ if (children.length === 0) {
+ func({ key: String(index.id), title: title });
+ } else {
+ if (depth < 1) {
+ eKeys.push(String(index.id));
+ }
+ keys.push(String(index.id));
+ const childTreeNodes: DataNode[] = [];
+ let called = 0;
+ children.forEach((value: Index) => {
+ makeTreeNode(value, depth + 1, (cNode) => {
+ called++;
+ childTreeNodes.push(cNode);
+ if (called === children.length) {
+ func({ key: String(index.id), title: title, children: childTreeNodes });
+ }
+ });
+ });
+ }
});
- if (depth < 1) {
- eKeys.push(String(index.id));
+ };
+ IndexUtil.get(type, INDEX_ID_PUBLIC, (index) => {
+ if (index != null) {
+ makeTreeNode(index, 0, (node) => {
+ tree.push(node);
+ setTree(tree);
+ setKeys(keys);
+ setExpandedKeys(eKeys);
+ setSelectedKeys([]);
+ });
}
- keys.push(String(index.id));
- return { key: String(index.id), title: title, children: childTreeNodes };
- };
- let elements: DataNode[] = [];
- const index = IndexUtil.get(type, INDEX_ID_PUBLIC);
- if (index !== null) {
- elements.push(makeTreeNode(index, 0));
- }
- return {
- elements: elements,
- keys: keys,
- expandedKeys: eKeys,
- };
- }
+ });
+ }, [lang, type]);
- componentDidUpdate(prevProps: Props, prevState: State) {
- const { lang, type } = this.props;
- if (prevProps.lang !== lang || prevProps.type !== type) {
- const res = this.load();
- this.setState({
- tree: res.elements,
- selectedKeys: [],
- });
- }
- }
+ const handleClickOpenAll = () => {
+ setExpandedKeys(keys);
+ };
- handleClickOpenAll() {
- this.setState({ expandedKeys: this.state.expandableKeys });
- }
+ const handleClickCloseAll = () => {
+ setExpandedKeys([]);
+ };
- handleClickCloseAll() {
- this.setState({ expandedKeys: [] });
- }
-
- handleExpand(
- expandedKeys: Key[],
+ const handleExpand: (
+ expandedKeys: React.Key[],
info: {
node: EventDataNode;
expanded: boolean;
nativeEvent: MouseEvent;
- }
- ): void {
+ },
+ ) => void = (expandedKeys) => {
const keys: string[] = expandedKeys.map((key) => {
- return typeof key === "string" ? key : String(key);
+ return typeof key === 'string' ? key : String(key);
});
- this.setState({ expandedKeys: keys });
- }
+ setExpandedKeys(keys);
+ };
- handleSelect(
- selectedKeys: Key[],
+ const handleSelect: (
+ selectedKeys: React.Key[],
info: {
- event: "select";
+ event: 'select';
selected: boolean;
node: EventDataNode;
selectedNodes: DataNode[];
nativeEvent: MouseEvent;
- }
- ): void {
- const navigate = useNavigate();
- const { type } = this.props;
- const selectedKey = selectedKeys.shift() || 0;
- const key = typeof selectedKey === "string" ? parseInt(selectedKey, 10) : selectedKey;
+ },
+ ) => void = (selectedKeys) => {
+ const selectedKey = selectedKeys.shift() ?? 0;
+ const key = typeof selectedKey === 'string' ? parseInt(selectedKey, 10) : selectedKey;
const url = IndexUtil.getUrl(type, key);
navigate(url);
- this.setState({ selectedKeys: [] });
+ setSelectedKeys([]);
+ };
+
+ if (tree.length === 0) {
+ return = (props) => {
+ const { lang, item, type } = props;
+ const [items, setItems] = React.useState([]);
-class BinderLinkItems extends React.Component {
- constructor(props: Props) {
- super(props);
- this.state = {
- items: [],
+ const isMounted = React.useRef(false);
+ React.useEffect(() => {
+ isMounted.current = true;
+ return () => {
+ isMounted.current = false;
};
- }
+ }, []);
- componentDidMount() {
- this.updateItems();
- }
-
- componentDidUpdate(prevProps: Props, prevState: State) {
- const prevItemIds = prevProps.item.item_link;
- const nextItemIds = this.props.item.item_link;
- if (prevItemIds.toString() !== nextItemIds.toString()) {
- this.updateItems();
- }
- }
-
- updateItems() {
- const { item, type } = this.props;
+ React.useEffect(() => {
const itemIds = item.item_link;
ItemUtil.getList(type, itemIds, (results) => {
- const items = results.data;
- this.setState({ items });
+ if (isMounted.current) {
+ setItems(results.data);
+ }
});
- }
+ }, [item.item_link, type]);
- render() {
- const { lang, type } = this.props;
- return (
-
-
- {this.state.items.map((item, idx) => {
- const evenodd = idx % 2 ? "even" : "odd";
- return (
-
- );
- }
-}
+ return (
+
+
+ {items.map((item, idx) => {
+ const evenodd = idx % 2 ? 'even' : 'odd';
+ return (
+
+ );
+};
class BinderDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemBinder;
return [
- { label: "ID", value: item.doi },
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: Functions.mlang(item.title, lang) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value:
- {i > 0 && ", "}
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
);
diff --git a/src/database/item-type/book/BookTop.tsx b/src/database/item-type/book/BookTop.tsx
index 65cfd57..9385778 100644
--- a/src/database/item-type/book/BookTop.tsx
+++ b/src/database/item-type/book/BookTop.tsx
@@ -1,13 +1,13 @@
-import iconFile from "../../assets/images/icon_book.gif";
-import TopBase, { TopBaseProps } from "../lib/TopBase";
+import iconFile from '../../assets/images/icon_book.gif';
+import TopBase, { TopBaseProps } from '../lib/TopBase';
class BookTop extends TopBase {
constructor(props: TopBaseProps) {
super(props);
- this.type = "book";
- this.label = "Book";
+ this.type = 'book';
+ this.label = 'Book';
this.icon = iconFile;
- this.description = "[en]Related book collection.[/en][ja]関連書籍[/ja]";
+ this.description = '[en]Related book collection.[/en][ja]関連書籍[/ja]';
}
}
diff --git a/src/database/item-type/book/index.tsx b/src/database/item-type/book/index.tsx
index b475402..028fafb 100644
--- a/src/database/item-type/book/index.tsx
+++ b/src/database/item-type/book/index.tsx
@@ -1,7 +1,7 @@
-import BookAdvancedSearch from "./BookAdvancedSearch";
-import BookDetail from "./BookDetail";
-import BookList from "./BookList";
-import BookTop from "./BookTop";
+import BookAdvancedSearch from './BookAdvancedSearch';
+import BookDetail from './BookDetail';
+import BookList from './BookList';
+import BookTop from './BookTop';
const ItemTypeBook = {
Top: BookTop,
diff --git a/src/database/item-type/conference/ConferenceAdvancedSearch.tsx b/src/database/item-type/conference/ConferenceAdvancedSearch.tsx
index 9098a55..a78aa6f 100644
--- a/src/database/item-type/conference/ConferenceAdvancedSearch.tsx
+++ b/src/database/item-type/conference/ConferenceAdvancedSearch.tsx
@@ -1,48 +1,67 @@
-import React from "react";
-import { ItemConferenceSubTypes } from "../../lib/ItemUtil";
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import { ItemConferenceSubTypes } from '../../lib/ItemUtil';
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class ConferenceAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "conference";
- this.title = "Conference";
+ this.type = 'conference';
+ this.title = 'Conference';
const now = new Date();
const year = String(now.getFullYear());
const month = String(now.getMonth() + 1);
const mday = String(now.getDate());
- this.state.values["title"] = "";
- this.state.values["presentation_type"] = "";
- this.state.values["author"] = "";
- this.state.values["conference_from_year"] = year;
- this.state.values["conference_from_month"] = month;
- this.state.values["conference_from_mday"] = mday;
- this.state.values["conference_to_year"] = year;
- this.state.values["conference_to_month"] = month;
- this.state.values["conference_to_mday"] = mday;
- this.setIgnoreKey("conference_from_year");
- this.setIgnoreKey("conference_from_month");
- this.setIgnoreKey("conference_from_mday");
- this.setIgnoreKey("conference_to_year");
- this.setIgnoreKey("conference_to_month");
- this.setIgnoreKey("conference_to_mday");
+ this.state.values.title = '';
+ this.state.values.presentation_type = '';
+ this.state.values.author = '';
+ this.state.values.conference_from_year = year;
+ this.state.values.conference_from_month = month;
+ this.state.values.conference_from_mday = mday;
+ this.state.values.conference_to_year = year;
+ this.state.values.conference_to_month = month;
+ this.state.values.conference_to_mday = mday;
+ this.setIgnoreKey('conference_from_year');
+ this.setIgnoreKey('conference_from_month');
+ this.setIgnoreKey('conference_from_mday');
+ this.setIgnoreKey('conference_to_year');
+ this.setIgnoreKey('conference_to_month');
+ this.setIgnoreKey('conference_to_mday');
}
renderDate() {
return (
<>
-
- {i > 0 && ", "}
+
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
-
+
);
});
return (
<>
{Functions.mlang(item.title, lang)}
- {Functions.mlang(item.conference_title, lang)} (
+ {Functions.mlang(item.conference_title, lang)} ( +
{authors} ); diff --git a/src/database/item-type/conference/ConferenceTop.tsx b/src/database/item-type/conference/ConferenceTop.tsx index df7fb7a..aeef252 100644 --- a/src/database/item-type/conference/ConferenceTop.tsx +++ b/src/database/item-type/conference/ConferenceTop.tsx @@ -1,14 +1,14 @@ -import iconFile from "../../assets/images/icon_conference.gif"; -import { ItemConferenceSubTypes } from "../../lib/ItemUtil"; -import TopBase, { TopBaseProps } from "../lib/TopBase"; +import iconFile from '../../assets/images/icon_conference.gif'; +import { ItemConferenceSubTypes } from '../../lib/ItemUtil'; +import TopBase, { TopBaseProps } from '../lib/TopBase'; class ConferenceTop extends TopBase { constructor(props: TopBaseProps) { super(props); - this.type = "conference"; - this.label = "Conference"; + this.type = 'conference'; + this.label = 'Conference'; this.icon = iconFile; - this.description = "[en]Electrical presentation files for conference.[/en][ja]学会発表[/ja]"; + this.description = '[en]Electrical presentation files for conference.[/en][ja]学会発表[/ja]'; this.subTypes = ItemConferenceSubTypes; } } diff --git a/src/database/item-type/conference/ConferenceUtil.tsx b/src/database/item-type/conference/ConferenceUtil.tsx index 31f3fa1..13ad72d 100644 --- a/src/database/item-type/conference/ConferenceUtil.tsx +++ b/src/database/item-type/conference/ConferenceUtil.tsx @@ -1,6 +1,6 @@ -import React from "react"; -import { MultiLang } from "../../../config"; -import { ItemConference, ItemConferenceSubType, ItemConferenceSubTypes } from "../../lib/ItemUtil"; +import React from 'react'; +import { MultiLang } from '../../../config'; +import { ItemConference, ItemConferenceSubType, ItemConferenceSubTypes } from '../../lib/ItemUtil'; interface PresentationTypeProps { lang: MultiLang; @@ -12,7 +12,7 @@ const PresentationType: React.FC = (props: PresentationTy
const subtype = ItemConferenceSubTypes.find((value) => {
return value.type === type;
});
- if (typeof subtype === "undefined") {
+ if (typeof subtype === 'undefined') {
return null;
}
return {subtype.label};
@@ -25,9 +25,34 @@ interface ConferenceDateProps {
const ConferenceDate: React.FC = (props: ConferenceDateProps) => {
const { item } = props;
- const monthStr = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
- const from = "From: " + monthStr[item.conference_from_month - 1] + " " + item.conference_from_mday + ", " + item.conference_from_year;
- const to = "To: " + monthStr[item.conference_to_month - 1] + " " + item.conference_to_mday + ", " + item.conference_to_year;
+ const monthStr = [
+ 'Jan',
+ 'Feb',
+ 'Mar',
+ 'Apr',
+ 'May',
+ 'Jun',
+ 'Jul',
+ 'Aug',
+ 'Sep',
+ 'Oct',
+ 'Nov',
+ 'Dec',
+ ];
+ const from =
+ 'From: ' +
+ monthStr[item.conference_from_month - 1] +
+ ' ' +
+ item.conference_from_mday +
+ ', ' +
+ item.conference_from_year;
+ const to =
+ 'To: ' +
+ monthStr[item.conference_to_month - 1] +
+ ' ' +
+ item.conference_to_mday +
+ ', ' +
+ item.conference_to_year;
return (
{from} {to}
diff --git a/src/database/item-type/conference/index.tsx b/src/database/item-type/conference/index.tsx
index 4420912..ae4bef1 100644
--- a/src/database/item-type/conference/index.tsx
+++ b/src/database/item-type/conference/index.tsx
@@ -1,7 +1,7 @@
-import ConferenceAdvancedSearch from "./ConferenceAdvancedSearch";
-import ConferenceDetail from "./ConferenceDetail";
-import ConferenceList from "./ConferenceList";
-import ConferenceTop from "./ConferenceTop";
+import ConferenceAdvancedSearch from './ConferenceAdvancedSearch';
+import ConferenceDetail from './ConferenceDetail';
+import ConferenceList from './ConferenceList';
+import ConferenceTop from './ConferenceTop';
const ItemTypeConference = {
Top: ConferenceTop,
diff --git a/src/database/item-type/data/DataAdvancedSearch.tsx b/src/database/item-type/data/DataAdvancedSearch.tsx
index 40f04a7..2138b1e 100644
--- a/src/database/item-type/data/DataAdvancedSearch.tsx
+++ b/src/database/item-type/data/DataAdvancedSearch.tsx
@@ -1,42 +1,68 @@
-import { ItemDataSubTypes } from "../../lib/ItemUtil";
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import { ItemDataSubTypes } from '../../lib/ItemUtil';
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class DataAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "data";
- this.title = "Data";
+ this.type = 'data';
+ this.title = 'Data';
const now = new Date();
const year = String(now.getFullYear());
const month = String(now.getMonth() + 1);
const mday = String(now.getDate());
- this.state.values["title"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
- this.state.values["doi"] = "";
- this.state.values["data_type"] = "";
- this.state.values["experimenter"] = "";
- this.state.values["publication_year"] = year;
- this.state.values["publication_month"] = month;
- this.state.values["publication_mday"] = mday;
- this.state.values["file.preview.caption"] = "";
- this.state.values["file.data_file.original_file_name"] = "";
- this.setIgnoreKey("publication_year");
- this.setIgnoreKey("publication_month");
- this.setIgnoreKey("publication_mday");
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
+ this.state.values.data_type = '';
+ this.state.values.experimenter = '';
+ this.state.values.publication_year = year;
+ this.state.values.publication_month = month;
+ this.state.values.publication_mday = mday;
+ this.state.values['file.preview.caption'] = '';
+ this.state.values['file.data_file.original_file_name'] = '';
+ this.setIgnoreKey('publication_year');
+ this.setIgnoreKey('publication_month');
+ this.setIgnoreKey('publication_mday');
}
getRows() {
const rows = [
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
- { label: "ID", value: this.renderFieldInputText("doi", 50) },
- { label: "[en]Data Type[/en][ja]データタイプ[/ja]", value: this.renderFieldSelect("data_type", ItemDataSubTypes) },
- { label: "[en]Experimenter[/en][ja]実験者[/ja]", value: this.renderFieldInputText("experimenter", 50) },
- { label: "[en]Date[/en][ja]日付[/ja]", value: this.renderFieldDate("", "publication_year", "publication_month", "publication_mday") },
- { label: "[en]Caption[/en][ja]キャプション[/ja]", value: this.renderFieldInputText("file.preview.caption", 50) },
- { label: "[en]Data File[/en][ja]データファイル[/ja]", value: this.renderFieldInputText("file.data_file.original_file_name", 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
+ {
+ label: '[en]Data Type[/en][ja]データタイプ[/ja]',
+ value: this.renderFieldSelect('data_type', ItemDataSubTypes),
+ },
+ {
+ label: '[en]Experimenter[/en][ja]実験者[/ja]',
+ value: this.renderFieldInputText('experimenter', 50),
+ },
+ {
+ label: '[en]Date[/en][ja]日付[/ja]',
+ value: this.renderFieldDate(
+ '',
+ 'publication_year',
+ 'publication_month',
+ 'publication_mday',
+ ),
+ },
+ {
+ label: '[en]Caption[/en][ja]キャプション[/ja]',
+ value: this.renderFieldInputText('file.preview.caption', 50),
+ },
+ {
+ label: '[en]Data File[/en][ja]データファイル[/ja]',
+ value: this.renderFieldInputText('file.data_file.original_file_name', 50),
+ },
];
return rows;
}
diff --git a/src/database/item-type/data/DataDetail.tsx b/src/database/item-type/data/DataDetail.tsx
index 9a26b67..5b2b890 100644
--- a/src/database/item-type/data/DataDetail.tsx
+++ b/src/database/item-type/data/DataDetail.tsx
@@ -1,39 +1,113 @@
-import React from "react";
-import Functions from "../../../functions";
-import ItemUtil, { ItemData } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
-import SimPFLinkIcon from "../lib/field/SimPFLinkIcon";
-import DataUtil from "./DataUtil";
+import Functions from '../../../functions';
+import ItemUtil, { ItemData } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
+import SimPFLinkIcon from '../lib/field/SimPFLinkIcon';
+import DataUtil from './DataUtil';
class DataDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemData;
const fields = [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value:
- {i > 0 && ", "}
+
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
-
+
);
});
return (
diff --git a/src/database/item-type/data/DataTop.tsx b/src/database/item-type/data/DataTop.tsx
index a745f85..48a4c04 100644
--- a/src/database/item-type/data/DataTop.tsx
+++ b/src/database/item-type/data/DataTop.tsx
@@ -1,14 +1,15 @@
-import iconFile from "../../assets/images/icon_data.gif";
-import { ItemDataSubTypes } from "../../lib/ItemUtil";
-import TopBase, { TopBaseProps } from "../lib/TopBase";
+import iconFile from '../../assets/images/icon_data.gif';
+import { ItemDataSubTypes } from '../../lib/ItemUtil';
+import TopBase, { TopBaseProps } from '../lib/TopBase';
class DataTop extends TopBase {
constructor(props: TopBaseProps) {
super(props);
- this.type = "data";
- this.label = "Data";
+ this.type = 'data';
+ this.label = 'Data';
this.icon = iconFile;
- this.description = "[en]Result data in numerical text/image/movie formats.[/en][ja]実験結果の数値データ/画像/動画など[/ja]";
+ this.description =
+ '[en]Result data in numerical text/image/movie formats.[/en][ja]実験結果の数値データ/画像/動画など[/ja]';
this.subTypes = ItemDataSubTypes;
}
}
diff --git a/src/database/item-type/data/DataUtil.tsx b/src/database/item-type/data/DataUtil.tsx
index 49cd70a..266e4a6 100644
--- a/src/database/item-type/data/DataUtil.tsx
+++ b/src/database/item-type/data/DataUtil.tsx
@@ -1,6 +1,6 @@
-import React from "react";
-import { MultiLang } from "../../../config";
-import { ItemDataSubType, ItemDataSubTypes } from "../../lib/ItemUtil";
+import React from 'react';
+import { MultiLang } from '../../../config';
+import { ItemDataSubType, ItemDataSubTypes } from '../../lib/ItemUtil';
interface DataTypeProps {
lang: MultiLang;
@@ -12,7 +12,7 @@ const DataType: React.FC = (props: DataTypeProps) => {
const subtype = ItemDataSubTypes.find((value) => {
return value.type === type;
});
- if (typeof subtype === "undefined") {
+ if (typeof subtype === 'undefined') {
return null;
}
return {subtype.label};
diff --git a/src/database/item-type/data/index.tsx b/src/database/item-type/data/index.tsx
index 4109e77..ceef05e 100644
--- a/src/database/item-type/data/index.tsx
+++ b/src/database/item-type/data/index.tsx
@@ -1,7 +1,7 @@
-import DataAdvancedSearch from "./DataAdvancedSearch";
-import DataDetail from "./DataDetail";
-import DataList from "./DataList";
-import DataTop from "./DataTop";
+import DataAdvancedSearch from './DataAdvancedSearch';
+import DataDetail from './DataDetail';
+import DataList from './DataList';
+import DataTop from './DataTop';
const ItemTypeData = {
Top: DataTop,
diff --git a/src/database/item-type/files/FilesAdvancedSearch.tsx b/src/database/item-type/files/FilesAdvancedSearch.tsx
index b16ceb1..4fe46fb 100644
--- a/src/database/item-type/files/FilesAdvancedSearch.tsx
+++ b/src/database/item-type/files/FilesAdvancedSearch.tsx
@@ -1,26 +1,41 @@
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class FilesAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "files";
- this.title = "Files";
- this.state.values["title"] = "";
- this.state.values["data_file_name"] = "";
- this.state.values["data_file_mimetype"] = "";
- this.state.values["data_file_filetype"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
+ this.type = 'files';
+ this.title = 'Files';
+ this.state.values.title = '';
+ this.state.values.data_file_name = '';
+ this.state.values.data_file_mimetype = '';
+ this.state.values.data_file_filetype = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
}
getRows() {
const rows = [
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "- [en]File Name[/en][ja]ファイル名[/ja]", value: this.renderFieldInputText("data_file_name", 50) },
- { label: "- [en]MIME Type[/en][ja]MIMEタイプ[/ja]", value: this.renderFieldInputText("data_file_mimetype", 50) },
- { label: "- [en]File Type[/en][ja]ファイルタイプ[/ja]", value: this.renderFieldInputText("data_file_filetype", 20) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '- [en]File Name[/en][ja]ファイル名[/ja]',
+ value: this.renderFieldInputText('data_file_name', 50),
+ },
+ {
+ label: '- [en]MIME Type[/en][ja]MIMEタイプ[/ja]',
+ value: this.renderFieldInputText('data_file_mimetype', 50),
+ },
+ {
+ label: '- [en]File Type[/en][ja]ファイルタイプ[/ja]',
+ value: this.renderFieldInputText('data_file_filetype', 20),
+ },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
];
return rows;
}
diff --git a/src/database/item-type/files/FilesDetail.tsx b/src/database/item-type/files/FilesDetail.tsx
index bf9d365..6d87e58 100644
--- a/src/database/item-type/files/FilesDetail.tsx
+++ b/src/database/item-type/files/FilesDetail.tsx
@@ -1,30 +1,61 @@
-import React from "react";
-import Functions from "../../../functions";
-import { ItemFiles } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
+import Functions from '../../../functions';
+import { ItemFiles } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
class FilesDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemFiles;
return [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value:
-
{item.data_file_mimetype} diff --git a/src/database/item-type/files/FilesTop.tsx b/src/database/item-type/files/FilesTop.tsx index 64c56fa..3f91270 100644 --- a/src/database/item-type/files/FilesTop.tsx +++ b/src/database/item-type/files/FilesTop.tsx @@ -1,14 +1,14 @@ -import iconFile from "../../assets/images/icon_files.gif"; -import { ItemFilesSubTypes } from "../../lib/ItemUtil"; -import TopBase, { TopBaseProps } from "../lib/TopBase"; +import iconFile from '../../assets/images/icon_files.gif'; +import { ItemFilesSubTypes } from '../../lib/ItemUtil'; +import TopBase, { TopBaseProps } from '../lib/TopBase'; class FilesTop extends TopBase { constructor(props: TopBaseProps) { super(props); - this.type = "files"; - this.label = "Files"; + this.type = 'files'; + this.label = 'Files'; this.icon = iconFile; - this.description = "[en]Various type of File.[/en][ja]ファイル[/ja]"; + this.description = '[en]Various type of File.[/en][ja]ファイル[/ja]'; this.subTypes = ItemFilesSubTypes; } } diff --git a/src/database/item-type/files/index.tsx b/src/database/item-type/files/index.tsx index 116672f..c34c2d7 100644 --- a/src/database/item-type/files/index.tsx +++ b/src/database/item-type/files/index.tsx @@ -1,7 +1,7 @@ -import FilesAdvancedSearch from "./FilesAdvancedSearch"; -import FilesDetail from "./FilesDetail"; -import FilesList from "./FilesList"; -import FilesTop from "./FilesTop"; +import FilesAdvancedSearch from './FilesAdvancedSearch'; +import FilesDetail from './FilesDetail'; +import FilesList from './FilesList'; +import FilesTop from './FilesTop'; const ItemTypeFiles = { Top: FilesTop, diff --git a/src/database/item-type/index.tsx b/src/database/item-type/index.tsx index 09102ba..2e0a993 100644 --- a/src/database/item-type/index.tsx +++ b/src/database/item-type/index.tsx @@ -1,7 +1,21 @@ -import React from 'react'; -import { MultiLang, BrainAtlasType } from '../../config'; +import { BrainAtlasType, MultiLang } from '../../config'; import AdvancedSearchQuery from '../lib/AdvancedSearchQuery'; -import { Item, ItemBinder, ItemBook, ItemConference, ItemData, ItemFiles, ItemModel, ItemPaper, ItemPresentation, ItemSimulator, ItemStimulus, ItemTool, ItemUrl, ItemMemo } from '../lib/ItemUtil'; +import { + Item, + ItemBinder, + ItemBook, + ItemConference, + ItemData, + ItemFiles, + ItemMemo, + ItemModel, + ItemPaper, + ItemPresentation, + ItemSimulator, + ItemStimulus, + ItemTool, + ItemUrl, +} from '../lib/ItemUtil'; import ItemTypeBinder from './binder'; import ItemTypeBook from './book'; import ItemTypeConference from './conference'; @@ -17,166 +31,168 @@ import ItemTypeTool from './tool'; import ItemTypeUrl from './url'; interface TopProps { - lang: MultiLang; - itemType: string; - type: BrainAtlasType; + lang: MultiLang; + itemType: string; + type: BrainAtlasType; } const Top = (props: TopProps) => { - const { lang, itemType, type } = props; - switch (itemType) { - case 'xnpbinder': - return;
}
class AdvancedSearchBase extends React.Component {
- protected type: string = "base";
- protected title: string = "Base";
+ protected type = 'base';
+ protected title = 'Base';
protected query: AdvancedSearchQuery;
protected ignoreKeys: string[] = [];
@@ -55,13 +55,13 @@ class AdvancedSearchBase extends React.Component
}
updateField(key: string, value: string) {
- let values = Object.assign({}, this.state.values);
+ const values = Object.assign({}, this.state.values);
values[key] = value;
this.updateQuery(key, value);
this.setState({ values });
}
- handleChangeTitleCheck(e: ChangeEvent) {
+ handleChangeTitleCheck(e: React.ChangeEvent) {
const show = e.target.checked;
if (show) {
Object.keys(this.state.values).forEach((key) => {
@@ -79,14 +79,22 @@ class AdvancedSearchBase extends React.Component
}
renderFieldInputText(key: string, size: number) {
- const onChange = (e: ChangeEvent) => {
+ const onChange: React.ChangeEventHandler = (e) => {
this.updateField(key, e.target.value);
};
- return ;
+ return (
+
+ );
}
- renderFieldSelect(key: string, values: ItemSubTypes) {
- const onChange = (e: ChangeEvent) => {
+ renderFieldSelect(key: string, values: ItemSubTypesAll) {
+ const onChange: React.ChangeEventHandler = (e) => {
this.updateField(key, e.target.value);
};
const options = values.map(({ type, label }, i) => {
@@ -105,18 +113,31 @@ class AdvancedSearchBase extends React.Component
}
renderFieldDate(label: string, keyYear: string, keyMonth: string, keyMday: string) {
- const onChange = (e: ChangeEvent) => {
+ const onChange: React.ChangeEventHandler = (e) => {
if (e.target.checked) {
this.deleteIgnoreKey(keyYear);
- keyMonth !== "" && this.deleteIgnoreKey(keyMonth);
- keyMday !== "" && this.deleteIgnoreKey(keyMday);
+ keyMonth !== '' && this.deleteIgnoreKey(keyMonth);
+ keyMday !== '' && this.deleteIgnoreKey(keyMday);
} else {
this.setIgnoreKey(keyYear);
- keyMonth !== "" && this.setIgnoreKey(keyMonth);
- keyMday !== "" && this.setIgnoreKey(keyMday);
+ keyMonth !== '' && this.setIgnoreKey(keyMonth);
+ keyMday !== '' && this.setIgnoreKey(keyMday);
}
};
- const month = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+ const month = [
+ 'Jan',
+ 'Feb',
+ 'Mar',
+ 'Apr',
+ 'May',
+ 'Jun',
+ 'Jul',
+ 'Aug',
+ 'Sep',
+ 'Oct',
+ 'Nov',
+ 'Dec',
+ ];
const monthOptions = month.map((value, i) => {
return (
);
});
- let mdayOptions: JSX.Element[] = [];
+ const mdayOptions: JSX.Element[] = [];
for (let i = 1; i <= 31; i++) {
mdayOptions.push(
+ ,
);
}
return (
}
const rows = this.getRows();
const fields = rows.map((value, idx) => {
- const evenodd = idx % 2 === 0 ? "even" : "odd";
+ const evenodd = idx % 2 === 0 ? 'even' : 'odd';
return (
{Functions.mlang(value.label, lang)}
@@ -180,7 +212,11 @@ class AdvancedSearchBase extends React.Component
-
+ this.handleChangeTitleCheck(e)}
+ />
{this.title}
diff --git a/src/database/item-type/lib/DetailBase.tsx b/src/database/item-type/lib/DetailBase.tsx
index 7521213..1674108 100644
--- a/src/database/item-type/lib/DetailBase.tsx
+++ b/src/database/item-type/lib/DetailBase.tsx
@@ -1,11 +1,12 @@
-import React, { ReactNode } from "react";
-import { BrainAtlasType, MultiLang } from "../../../config";
-import Functions from "../../../functions";
-import { Item } from "../../lib/ItemUtil";
+import React from 'react';
+
+import { BrainAtlasType, MultiLang } from '../../../config';
+import Functions from '../../../functions';
+import { Item } from '../../lib/ItemUtil';
export interface DetailBaseField {
label: string;
- value: ReactNode;
+ value: React.ReactNode;
}
export interface DetailBaseProps {
@@ -22,7 +23,7 @@ class DetailBase extends React.Component {
render() {
const { lang } = this.props;
const elements = this.getFields().map((value, idx) => {
- const evenodd = idx % 2 === 0 ? "even" : "odd";
+ const evenodd = idx % 2 === 0 ? 'even' : 'odd';
return (
{Functions.mlang(value.label, lang)}
diff --git a/src/database/item-type/lib/ListBase.tsx b/src/database/item-type/lib/ListBase.tsx
index 3a96c21..876124c 100644
--- a/src/database/item-type/lib/ListBase.tsx
+++ b/src/database/item-type/lib/ListBase.tsx
@@ -1,7 +1,8 @@
-import React from "react";
-import { BrainAtlasType, MultiLang } from "../../../config";
-import ItemUtil, { Item } from "../../lib/ItemUtil";
-import SimPFLinkIcon from "./field/SimPFLinkIcon";
+import React from 'react';
+
+import { BrainAtlasType, MultiLang } from '../../../config';
+import ItemUtil, { Item } from '../../lib/ItemUtil';
+import SimPFLinkIcon from './field/SimPFLinkIcon';
export interface ListBaseProps {
lang: MultiLang;
@@ -10,8 +11,8 @@ export interface ListBaseProps {
}
class ListBase extends React.Component {
- protected label = "";
- protected icon = "";
+ protected label = '';
+ protected icon = '';
protected url: string;
protected simpfLinkUrl: string;
diff --git a/src/database/item-type/lib/TopBase.tsx b/src/database/item-type/lib/TopBase.tsx
index 4e15ee0..2568a4c 100644
--- a/src/database/item-type/lib/TopBase.tsx
+++ b/src/database/item-type/lib/TopBase.tsx
@@ -1,8 +1,9 @@
-import React, { Fragment } from "react";
-import { Link } from "react-router-dom";
-import { BrainAtlasType, MultiLang } from "../../../config";
-import Functions from "../../../functions";
-import ItemUtil, { ItemSubTypes } from "../../lib/ItemUtil";
+import React from 'react';
+
+import { Link } from 'react-router-dom';
+import { BrainAtlasType, MultiLang } from '../../../config';
+import Functions from '../../../functions';
+import ItemUtil, { ItemSubTypesAll } from '../../lib/ItemUtil';
export interface TopBaseProps {
lang: MultiLang;
@@ -10,22 +11,22 @@ export interface TopBaseProps {
}
class TopBase extends React.Component {
- protected type: string = "";
- protected label: string = "";
- protected icon: string = "";
- protected description: string = "";
- protected subTypes: ItemSubTypes = [];
+ protected type = '';
+ protected label = '';
+ protected icon = '';
+ protected description = '';
+ protected subTypes: ItemSubTypesAll = [];
render() {
const { lang, type } = this.props;
- const url = ItemUtil.getItemTypeSearchUrl(type, this.type, "");
+ const url = ItemUtil.getItemTypeSearchUrl(type, this.type, '');
const links = this.subTypes.map((subtype, i) => {
const url = ItemUtil.getItemTypeSearchUrl(type, this.type, subtype.type);
return (
-
- {i > 0 && " / "}
+
+ {i > 0 && ' / '}
{subtype.label}
-
+
);
});
return (
diff --git a/src/database/item-type/lib/field/Author.tsx b/src/database/item-type/lib/field/Author.tsx
index 3286e84..f2d6c9d 100644
--- a/src/database/item-type/lib/field/Author.tsx
+++ b/src/database/item-type/lib/field/Author.tsx
@@ -1,18 +1,19 @@
-import React from "react";
-import { MultiLang } from "../../../../config";
+import React from 'react';
+
+import { MultiLang } from '../../../../config';
interface Props {
lang: MultiLang;
author: string[];
}
-const Author: React.FC = (props: Props) => {
+const Author: React.FC = (props) => {
const { author } = props;
if (author.length === 0) {
return null;
}
const elements = author.map((value, idx) => {
- const evenodd = idx % 2 === 0 ? "even" : "odd";
+ const evenodd = idx % 2 === 0 ? 'even' : 'odd';
return (
{value}
diff --git a/src/database/item-type/lib/field/ChangeLog.tsx b/src/database/item-type/lib/field/ChangeLog.tsx
index b95cdfa..a92470c 100644
--- a/src/database/item-type/lib/field/ChangeLog.tsx
+++ b/src/database/item-type/lib/field/ChangeLog.tsx
@@ -1,15 +1,16 @@
-import React from "react";
-import { MultiLang } from "../../../../config";
-import Functions from "../../../../functions";
-import { ItemBasicChangeLog } from "../../../lib/ItemUtil";
-import DateTime from "./DateTime";
+import React from 'react';
+
+import { MultiLang } from '../../../../config';
+import Functions from '../../../../functions';
+import { ItemBasicChangeLog } from '../../../lib/ItemUtil';
+import DateTime from './DateTime';
interface Props {
lang: MultiLang;
changelog: ItemBasicChangeLog[];
}
-const ChangeLog: React.FC = (props: Props) => {
+const ChangeLog: React.FC = (props) => {
const { lang, changelog } = props;
if (changelog.length === 0) {
return null;
diff --git a/src/database/item-type/lib/field/Contributer.tsx b/src/database/item-type/lib/field/Contributer.tsx
deleted file mode 100644
index 0ab3b80..0000000
--- a/src/database/item-type/lib/field/Contributer.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from "react";
-import { MultiLang } from "../../../../config";
-import Functions from "../../../../functions";
-
-interface Props {
- lang: MultiLang;
- uname: string;
- name: string;
-}
-
-const Contributer: React.FC = (props: Props) => {
- const { lang, name, uname } = props;
- const unsubscribed = "([en]Unsubscribed User[/en][ja]退会済みユーザ[/ja])";
- const label = uname === "" ? unsubscribed : name === "" ? uname : name + " (" + uname + ")";
- return {Functions.mlang(label, lang)};
-};
-
-export default Contributer;
diff --git a/src/database/item-type/lib/field/Contributor.tsx b/src/database/item-type/lib/field/Contributor.tsx
new file mode 100644
index 0000000..8b741ba
--- /dev/null
+++ b/src/database/item-type/lib/field/Contributor.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+
+import { MultiLang } from '../../../../config';
+import Functions from '../../../../functions';
+
+interface Props {
+ lang: MultiLang;
+ uname: string;
+ name: string;
+}
+
+const Contributor: React.FC = (props) => {
+ const { lang, name, uname } = props;
+ const unsubscribed = '([en]Unsubscribed User[/en][ja]退会済みユーザ[/ja])';
+ const label = uname === '' ? unsubscribed : name === '' ? uname : name + ' (' + uname + ')';
+ return {Functions.mlang(label, lang)};
+};
+
+export default Contributor;
diff --git a/src/database/item-type/lib/field/CreativeCommons.tsx b/src/database/item-type/lib/field/CreativeCommons.tsx
index b542619..4505ec6 100644
--- a/src/database/item-type/lib/field/CreativeCommons.tsx
+++ b/src/database/item-type/lib/field/CreativeCommons.tsx
@@ -1,51 +1,57 @@
-import React from "react";
-import { MultiLang } from "../../../../config";
+import React from 'react';
-export type CreativeCommonsType = "by" | "by-nc" | "by-nc-nd" | "by-nc-sa" | "by-nd" | "by-sa";
+import { MultiLang } from '../../../../config';
-export const getCreativeCommonsType = (ccCommercialUse: number, ccModification: number): CreativeCommonsType => {
+type CreativeCommonsType = 'by' | 'by-nc' | 'by-nc-nd' | 'by-nc-sa' | 'by-nd' | 'by-sa';
+
+const getCreativeCommonsType = (
+ ccCommercialUse: number,
+ ccModification: number,
+): CreativeCommonsType => {
const cc = ccCommercialUse * 10 + ccModification;
switch (cc) {
case 0:
- return "by-nc-nd";
+ return 'by-nc-nd';
case 1:
- return "by-nc-sa";
+ return 'by-nc-sa';
case 2:
- return "by-nc";
+ return 'by-nc';
case 10:
- return "by-nd";
+ return 'by-nd';
case 11:
- return "by-sa";
+ return 'by-sa';
case 12:
default:
- return "by";
+ return 'by';
}
};
interface Props {
lang: MultiLang;
- type: CreativeCommonsType;
+ ccCommercialUse: number;
+ ccModification: number;
}
-const CreativeCommons: React.FC = (props: Props) => {
- const { type } = props;
- const url = "http://creativecommons.org/licenses/" + type + "/4.0/";
- const logoUrl = "https://i.creativecommons.org/l/" + type + "/4.0/88x31.png";
+const CreativeCommons: React.FC = (props) => {
+ const { ccCommercialUse, ccModification } = props;
+ const type = getCreativeCommonsType(ccCommercialUse, ccModification);
+ const url = 'http://creativecommons.org/licenses/' + type + '/4.0/';
+ const logoUrl = 'https://i.creativecommons.org/l/' + type + '/4.0/88x31.png';
const labels = {
- by: "Attribution",
- nc: "NonCommercial",
- nd: "NoDerivatives",
- sa: "ShareAlike",
+ by: 'Attribution',
+ nc: 'NonCommercial',
+ nd: 'NoDerivatives',
+ sa: 'ShareAlike',
};
const label = type
- .split("-")
+ .split('-')
.map((value) => {
- const prop = value as "by" | "nc" | "nd" | "sa";
+ const prop = value as 'by' | 'nc' | 'nd' | 'sa';
return labels[prop];
})
- .join("-");
+ .join('-');
return (
-
+
{downloadLimit === 1 && (
<>
-
({Functions.mlang("[en]File has been removed[/en][ja]ファイルは削除されました[/ja]", lang)}) +
( + {Functions.mlang('[en]File has been removed[/en][ja]ファイルは削除されました[/ja]', lang)} + ) )} diff --git a/src/database/item-type/lib/field/ItemIndex.tsx b/src/database/item-type/lib/field/ItemIndex.tsx index 4f49001..89e3776 100644 --- a/src/database/item-type/lib/field/ItemIndex.tsx +++ b/src/database/item-type/lib/field/ItemIndex.tsx @@ -1,9 +1,10 @@ -import React from "react"; -import { Link } from "react-router-dom"; -import { BrainAtlasType, MultiLang } from "../../../../config"; -import Functions from "../../../../functions"; -import IndexUtil from "../../../lib/IndexUtil"; -import { ItemBasicIndex } from "../../../lib/ItemUtil"; +import React from 'react'; + +import { Link } from 'react-router-dom'; +import { BrainAtlasType, MultiLang } from '../../../../config'; +import Functions from '../../../../functions'; +import IndexUtil from '../../../lib/IndexUtil'; +import { ItemBasicIndex } from '../../../lib/ItemUtil'; interface Props { lang: MultiLang; @@ -11,13 +12,13 @@ interface Props { type: BrainAtlasType; } -const ItemIndex: React.FC = (props: Props) => {
+const ItemIndex: React.FC = (props) => {
const { lang, index, type } = props;
if (index.length === 0) {
return null;
}
const elements = index.map((value, idx) => {
- const evenodd = idx % 2 === 0 ? "even" : "odd";
+ const evenodd = idx % 2 === 0 ? 'even' : 'odd';
const url = IndexUtil.getUrl(type, value.index_id);
return (
diff --git a/src/database/item-type/lib/field/Language.tsx b/src/database/item-type/lib/field/Language.tsx
index 6dc5859..1655c3e 100644
--- a/src/database/item-type/lib/field/Language.tsx
+++ b/src/database/item-type/lib/field/Language.tsx
@@ -1,30 +1,30 @@
-import React from "react";
-import { MultiLang } from "../../../../config";
-import Functions from "../../../../functions";
-import { ItemBasicLang } from "../../../lib/ItemUtil";
+import React from 'react';
+import { MultiLang } from '../../../../config';
+import Functions from '../../../../functions';
+import { ItemBasicLang } from '../../../lib/ItemUtil';
interface Props {
lang: MultiLang;
itemLang: ItemBasicLang;
}
-const Language: React.FC = (props: Props) => {
+const Language: React.FC = (props) => {
const { lang, itemLang } = props;
const langStr = {
- eng: "[en]English[/en][ja]英語[/ja]",
- jpn: "[en]Japanese[/en][ja]日本語[/ja]",
- fra: "[en]French[/en][ja]フランス語[/ja]",
- deu: "[en]German[/en][ja]ドイツ語[/ja]",
- esl: "[en]Spanish[/en][ja]スペイン語[/ja]",
- ita: "[en]Italian[/en][ja]イタリア語[/ja]",
- dut: "[en]Dutch[/en][ja]オランダ語[/ja]",
- sve: "[en]Swedish[/en][ja]スウェーデン語[/ja]",
- nor: "[en]Norwegian[/en][ja]ノルウェー語[/ja]",
- dan: "[en]Danish[/en][ja]デンマーク語[/ja]",
- fin: "[en]Finnish[/en][ja]フィンランド語[/ja]",
- por: "[en]Portuguese[/en][ja]ポルトガル語[/ja]",
- chi: "[en]Chinese[/en][ja]中国語[/ja]",
- kor: "[en]Korean[/en][ja]韓国語[/ja]",
+ eng: '[en]English[/en][ja]英語[/ja]',
+ jpn: '[en]Japanese[/en][ja]日本語[/ja]',
+ fra: '[en]French[/en][ja]フランス語[/ja]',
+ deu: '[en]German[/en][ja]ドイツ語[/ja]',
+ esl: '[en]Spanish[/en][ja]スペイン語[/ja]',
+ ita: '[en]Italian[/en][ja]イタリア語[/ja]',
+ dut: '[en]Dutch[/en][ja]オランダ語[/ja]',
+ sve: '[en]Swedish[/en][ja]スウェーデン語[/ja]',
+ nor: '[en]Norwegian[/en][ja]ノルウェー語[/ja]',
+ dan: '[en]Danish[/en][ja]デンマーク語[/ja]',
+ fin: '[en]Finnish[/en][ja]フィンランド語[/ja]',
+ por: '[en]Portuguese[/en][ja]ポルトガル語[/ja]',
+ chi: '[en]Chinese[/en][ja]中国語[/ja]',
+ kor: '[en]Korean[/en][ja]韓国語[/ja]',
};
if (!(itemLang in langStr)) {
return null;
diff --git a/src/database/item-type/lib/field/LicenseAgreementDialog.tsx b/src/database/item-type/lib/field/LicenseAgreementDialog.tsx
index 95d4342..0d8cced 100644
--- a/src/database/item-type/lib/field/LicenseAgreementDialog.tsx
+++ b/src/database/item-type/lib/field/LicenseAgreementDialog.tsx
@@ -1,12 +1,14 @@
-import React, { ChangeEvent, MouseEvent } from "react";
-import { Modal } from "react-overlays";
-import { BrainAtlasType, MultiLang } from "../../../../config";
-import Functions from "../../../../functions";
-import ItemUtil, { ItemBasicFile } from "../../../lib/ItemUtil";
-import DateTime from "./DateTime";
-import FileSize from "./FileSize";
-import styles from "./LicenseAgreementDialog.module.css";
-import Rights from "./Rights";
+import React from 'react';
+
+import { Modal } from 'react-overlays';
+import { RenderModalBackdropProps } from 'react-overlays/cjs/Modal';
+import { BrainAtlasType, MultiLang } from '../../../../config';
+import Functions from '../../../../functions';
+import ItemUtil, { ItemBasicFile } from '../../../lib/ItemUtil';
+import DateTime from './DateTime';
+import FileSize from './FileSize';
+import styles from './LicenseAgreementDialog.module.css';
+import Rights from './Rights';
interface Props {
lang: MultiLang;
@@ -20,117 +22,138 @@ interface Props {
type: BrainAtlasType;
}
-interface State {
- show: boolean;
- disabled: boolean;
-}
+const LicenseAgreementDialog: React.FC = (props) => {
+ const { lang, file, rights, useCc, ccCommercialUse, ccModification, show, unsetShow, type } =
+ props;
-class LicenseAgreementDialog extends React.Component {
- constructor(props: Props) {
- super(props);
- this.state = {
- show: props.show,
- disabled: false,
- };
- this.handleChangeCheckbox = this.handleChangeCheckbox.bind(this);
- this.handleClickDownload = this.handleClickDownload.bind(this);
- this.handleClickCancel = this.handleClickCancel.bind(this);
- }
+ const [isShow, setIsShow] = React.useState(show);
+ const [disabled, setDisabled] = React.useState(false);
- static getDerivedStateFromProps(nextProps: Props, prevState: State) {
- if (nextProps.show && !prevState.show) {
- return { disabled: true, show: nextProps.show };
+ React.useEffect(() => {
+ if (show) {
+ setDisabled(true);
}
- return null;
- }
+ }, [show]);
- handleChangeCheckbox(e: ChangeEvent) {
- const disabled = e.target.value === "0";
- this.setState({ disabled });
- }
+ const handleChangeCheckbox: React.ChangeEventHandler = (e) => {
+ const disabled = e.target.value === '0';
+ setDisabled(disabled);
+ };
- handleClickDownload(e: MouseEvent) {
- this.props.unsetShow();
- this.setState({ show: false });
- }
+ const handleClickDownload: React.MouseEventHandler = () => {
+ unsetShow();
+ setIsShow(false);
+ };
- handleClickCancel() {
- this.props.unsetShow();
- this.setState({ show: false });
- }
+ const handleClickCancel = () => {
+ unsetShow();
+ setIsShow(false);
+ };
- renderBackdrop(props: any) {
+ const renderBackdrop = (props: RenderModalBackdropProps) => {
return ;
- }
+ };
- render() {
- const { lang, type } = this.props;
- const date = new Date(this.props.file.timestamp);
- const timestamp = Math.floor(date.valueOf() / 1000);
- const url = ItemUtil.getFileUrl(type, this.props.file);
- return (
-
+ const date = new Date(file.timestamp);
+ const timestamp = Math.floor(date.valueOf() / 1000);
+ const url = ItemUtil.getFileUrl(type, file);
+ return (
+
+
= (props) => {
+ const { lang, file, type } = props;
-class Preview extends React.Component {
- constructor(props: Props) {
- super(props);
- this.state = {
- isOpen: false,
- imageIndex: 0,
- };
+ const [isOpen, setIsOpen] = React.useState(false);
+ const [imageIndex, setImageIndex] = React.useState(0);
+
+ const data = file.filter((value) => {
+ return value.file_type_name === 'preview';
+ });
+ if (data.length === 0) {
+ return null;
}
+ const slides: SlideImage[] = [];
- render() {
- const { lang, file, type } = this.props;
- const data = file.filter((value) => {
- return value.file_type_name === "preview";
- });
- if (data.length === 0) {
- return null;
- }
- let imageUrls: string[] = [];
- const previews = data.map((value, idx) => {
- const fileUrl = ItemUtil.getFileUrl(type, value);
- const previewUrl = ItemUtil.getPreviewFileUrl(type, value);
- const caption = Functions.mlang(value.caption, lang);
- imageUrls.push(fileUrl);
- return (
-
- {
- e.preventDefault();
- this.setState({ isOpen: true, imageIndex: idx });
- }}
- >
- 
-
- {caption}
-
- );
- });
- const { isOpen, imageIndex } = this.state;
+ const previews = data.map((value, idx) => {
+ const fileUrl = ItemUtil.getFileUrl(type, value);
+ const previewUrl = ItemUtil.getPreviewFileUrl(type, value);
+ const caption = Functions.mlang(value.caption, lang);
+ slides.push({ src: fileUrl });
return (
- <>
- this.setState({ isOpen: false })}
- onMovePrevRequest={() =>
- this.setState({
- imageIndex: (imageIndex + data.length - 1) % data.length,
- })
- }
- onMoveNextRequest={() =>
- this.setState({
- imageIndex: (imageIndex + 1) % data.length,
- })
- }
- />
- )}
-
+
+ {
+ e.preventDefault();
+ setIsOpen(true);
+ setImageIndex(idx);
+ }}
+ >
+
+
+ {caption}
+
);
- }
-}
+ });
+
+ return (
+ <>
+ setIsOpen(false)} />}
+
+ );
+};
export default Preview;
diff --git a/src/database/item-type/lib/field/PublicationDate.tsx b/src/database/item-type/lib/field/PublicationDate.tsx
index 2e8fc08..d418b26 100644
--- a/src/database/item-type/lib/field/PublicationDate.tsx
+++ b/src/database/item-type/lib/field/PublicationDate.tsx
@@ -1,6 +1,7 @@
-import React from "react";
-import { MultiLang } from "../../../../config";
-import DateTime from "./DateTime";
+import React from 'react';
+
+import { MultiLang } from '../../../../config';
+import DateTime from './DateTime';
interface Props {
lang: MultiLang;
@@ -9,9 +10,9 @@ interface Props {
mday: number;
}
-const PublicationDate: React.FC = (props: Props) => {
+const PublicationDate: React.FC = (props) => {
const { lang, year, month, mday } = props;
- const d = new Date(year + "-" + month + "-" + mday);
+ const d = new Date(year + '-' + month + '-' + mday);
const timestamp = Math.floor(d.valueOf() / 1000);
return = (props: Props) => {
+const Readme: React.FC = (props) => {
const { lang, readme } = props;
return = (props) => {
+ const { lang, relatedTo, type } = props;
+ const isMounted = React.useRef(false);
-class RelatedTo extends React.Component {
- private isActive: boolean;
+ const [elements, setElements] = React.useState([]);
- constructor(props: Props) {
- super(props);
- this.state = {
- elements: [],
+ React.useEffect(() => {
+ isMounted.current = true;
+ return () => {
+ isMounted.current = false;
};
- this.isActive = false;
- }
+ }, []);
- componentDidMount() {
- this.isActive = true;
- this.updateElements(this.props.relatedTo);
- }
-
- componentDidUpdate(prevProps: Props) {
- if (JSON.stringify(this.props.relatedTo) !== JSON.stringify(prevProps.relatedTo)) {
- this.updateElements(this.props.relatedTo);
- }
- }
-
- componentWillUnmount() {
- this.isActive = false;
- }
-
- updateElements(relatedTo: number[]) {
- const { lang, type } = this.props;
+ React.useEffect(() => {
if (relatedTo.length === 0) {
- this.setState({ elements: [] });
+ setElements([]);
} else {
ItemUtil.getList(type, relatedTo, (results) => {
const elements = results.data.map((item, idx) => {
- const evenodd = idx % 0 ? "even" : "odd";
+ const evenodd = idx % 0 ? 'even' : 'odd';
return (
@@ -55,28 +38,26 @@ class RelatedTo extends React.Component {
);
});
- if (this.isActive) {
- this.setState({ elements });
+ if (isMounted.current) {
+ setElements(elements);
}
});
}
- }
+ }, [lang, relatedTo, type]);
- render() {
- if (this.state.elements.length === 0) {
- return null;
- }
- return (
-
-
-
- );
+ if (elements.length === 0) {
+ return null;
}
-}
+ return (
+
+
+
+ );
+};
export default RelatedTo;
diff --git a/src/database/item-type/lib/field/Rights.tsx b/src/database/item-type/lib/field/Rights.tsx
index cd223b5..6c26d25 100644
--- a/src/database/item-type/lib/field/Rights.tsx
+++ b/src/database/item-type/lib/field/Rights.tsx
@@ -1,7 +1,8 @@
-import React from "react";
-import { MultiLang } from "../../../../config";
-import CreativeCommons, { getCreativeCommonsType } from "./CreativeCommons";
-import Description from "./Description";
+import React from 'react';
+
+import { MultiLang } from '../../../../config';
+import CreativeCommons from './CreativeCommons';
+import Description from './Description';
interface Props {
lang: MultiLang;
@@ -11,13 +12,18 @@ interface Props {
ccModification: number;
}
-const Rights: React.FC = (props: Props) => {
+const Rights: React.FC = (props) => {
const { lang, rights, useCc, ccCommercialUse, ccModification } = props;
if (useCc === 0) {
return = (props: Props) => {
+const SimPFLinkIcon: React.FC = (props) => {
const { url, isDetail } = props;
- const title = "Online Simulation";
+ const title = 'Online Simulation';
const size = isDetail ? 64 : 35;
- if (url === "") {
+ if (url === '') {
return null;
}
return (
diff --git a/src/database/item-type/lib/field/index.tsx b/src/database/item-type/lib/field/index.tsx
index 5a98dbb..56726f0 100644
--- a/src/database/item-type/lib/field/index.tsx
+++ b/src/database/item-type/lib/field/index.tsx
@@ -1,25 +1,25 @@
-import Author from "./Author";
-import ChangeLog from "./ChangeLog";
-import Contributer from "./Contributer";
-import CreativeCommons from "./CreativeCommons";
-import DateTime from "./DateTime";
-import Description from "./Description";
-import FileDownloadButton from "./FileDownloadButton";
-import FileSize from "./FileSize";
-import FreeKeyword from "./FreeKeyword";
-import ItemFile from "./ItemFile";
-import ItemIndex from "./ItemIndex";
-import Language from "./Language";
-import Preview from "./Preview";
-import PublicationDate from "./PublicationDate";
-import Readme from "./Readme";
-import RelatedTo from "./RelatedTo";
-import Rights from "./Rights";
+import Author from './Author';
+import ChangeLog from './ChangeLog';
+import Contributor from './Contributor';
+import CreativeCommons from './CreativeCommons';
+import DateTime from './DateTime';
+import Description from './Description';
+import FileDownloadButton from './FileDownloadButton';
+import FileSize from './FileSize';
+import FreeKeyword from './FreeKeyword';
+import ItemFile from './ItemFile';
+import ItemIndex from './ItemIndex';
+import Language from './Language';
+import Preview from './Preview';
+import PublicationDate from './PublicationDate';
+import Readme from './Readme';
+import RelatedTo from './RelatedTo';
+import Rights from './Rights';
const ItemTypeField = {
Author,
ChangeLog,
- Contributer,
+ Contributor,
CreativeCommons,
DateTime,
Description,
diff --git a/src/database/item-type/memo/MemoAdvancedSearch.tsx b/src/database/item-type/memo/MemoAdvancedSearch.tsx
index be68075..1e14ba6 100644
--- a/src/database/item-type/memo/MemoAdvancedSearch.tsx
+++ b/src/database/item-type/memo/MemoAdvancedSearch.tsx
@@ -1,24 +1,33 @@
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class MemoAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "memo";
- this.title = "Memo";
- this.state.values["title"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
- this.state.values["doi"] = "";
- this.state.values["item_link"] = "";
+ this.type = 'memo';
+ this.title = 'Memo';
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
+ this.state.values.item_link = '';
}
getRows() {
const rows = [
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
- { label: "ID", value: this.renderFieldInputText("doi", 50) },
- { label: "[en]Item Link[/en][ja]リンク[/ja]", value: this.renderFieldInputText("item_link", 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
+ {
+ label: '[en]Item Link[/en][ja]リンク[/ja]',
+ value: this.renderFieldInputText('item_link', 50),
+ },
];
return rows;
}
diff --git a/src/database/item-type/memo/MemoDetail.tsx b/src/database/item-type/memo/MemoDetail.tsx
index 79e4e3a..e11d2dd 100644
--- a/src/database/item-type/memo/MemoDetail.tsx
+++ b/src/database/item-type/memo/MemoDetail.tsx
@@ -1,29 +1,63 @@
-import React from "react";
-import XoopsCode from "../../../common/lib/XoopsCode";
-import Functions from "../../../functions";
-import { ItemMemo } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
+import XoopsCode from '../../../common/lib/XoopsCode';
+import Functions from '../../../functions';
+import { ItemMemo } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
class MemoDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemMemo;
const fields = [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value:
- {i > 0 && ", "}
+
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
-
+
);
});
return (
diff --git a/src/database/item-type/model/ModelTop.tsx b/src/database/item-type/model/ModelTop.tsx
index 80a6931..f2844da 100644
--- a/src/database/item-type/model/ModelTop.tsx
+++ b/src/database/item-type/model/ModelTop.tsx
@@ -1,14 +1,14 @@
-import iconFile from "../../assets/images/icon_model.gif";
-import { ItemModelSubTypes } from "../../lib/ItemUtil";
-import TopBase, { TopBaseProps } from "../lib/TopBase";
+import iconFile from '../../assets/images/icon_model.gif';
+import { ItemModelSubTypes } from '../../lib/ItemUtil';
+import TopBase, { TopBaseProps } from '../lib/TopBase';
class ModelTop extends TopBase {
constructor(props: TopBaseProps) {
super(props);
- this.type = "model";
- this.label = "Model";
+ this.type = 'model';
+ this.label = 'Model';
this.icon = iconFile;
- this.description = "[en]Model programs/scripts.[/en][ja]モデル プログラム/スクリプト[/ja]";
+ this.description = '[en]Model programs/scripts.[/en][ja]モデル プログラム/スクリプト[/ja]';
this.subTypes = ItemModelSubTypes;
}
}
diff --git a/src/database/item-type/model/ModelUtil.tsx b/src/database/item-type/model/ModelUtil.tsx
index a636bff..7649e7a 100644
--- a/src/database/item-type/model/ModelUtil.tsx
+++ b/src/database/item-type/model/ModelUtil.tsx
@@ -1,6 +1,6 @@
-import React from "react";
-import { MultiLang } from "../../../config";
-import { ItemModelSubType, ItemModelSubTypes } from "../../lib/ItemUtil";
+import React from 'react';
+import { MultiLang } from '../../../config';
+import { ItemModelSubType, ItemModelSubTypes } from '../../lib/ItemUtil';
interface ModelTypeProps {
lang: MultiLang;
@@ -12,7 +12,7 @@ const ModelType: React.FC = (props: ModelTypeProps) => {
const subtype = ItemModelSubTypes.find((value) => {
return value.type === type;
});
- if (typeof subtype === "undefined") {
+ if (typeof subtype === 'undefined') {
return null;
}
return {subtype.label};
diff --git a/src/database/item-type/model/index.tsx b/src/database/item-type/model/index.tsx
index 2e0ca62..603192b 100644
--- a/src/database/item-type/model/index.tsx
+++ b/src/database/item-type/model/index.tsx
@@ -1,7 +1,7 @@
-import ModelAdvancedSearch from "./ModelAdvancedSearch";
-import ModelDetail from "./ModelDetail";
-import ModelList from "./ModelList";
-import ModelTop from "./ModelTop";
+import ModelAdvancedSearch from './ModelAdvancedSearch';
+import ModelDetail from './ModelDetail';
+import ModelList from './ModelList';
+import ModelTop from './ModelTop';
const ItemTypeModel = {
Top: ModelTop,
diff --git a/src/database/item-type/paper/PaperAdvancedSearch.tsx b/src/database/item-type/paper/PaperAdvancedSearch.tsx
index b9ffdd0..55bb513 100644
--- a/src/database/item-type/paper/PaperAdvancedSearch.tsx
+++ b/src/database/item-type/paper/PaperAdvancedSearch.tsx
@@ -1,36 +1,48 @@
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class PaperAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "paper";
- this.title = "Paper";
- this.state.values["pubmed_id"] = "";
- this.state.values["title"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
- this.state.values["doi"] = "";
- this.state.values["author"] = "";
- this.state.values["journal"] = "";
- this.state.values["publication_year"] = "";
- this.state.values["volume"] = "";
- this.state.values["number"] = "";
- this.state.values["page"] = "";
+ this.type = 'paper';
+ this.title = 'Paper';
+ this.state.values.pubmed_id = '';
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
+ this.state.values.author = '';
+ this.state.values.journal = '';
+ this.state.values.publication_year = '';
+ this.state.values.volume = '';
+ this.state.values.number = '';
+ this.state.values.page = '';
}
getRows() {
const rows = [
- { label: "PubMed ID", value: this.renderFieldInputText("pubmed_id", 50) },
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
- { label: "ID", value: this.renderFieldInputText("doi", 50) },
- { label: "[en]Author[/en][ja]著者[/ja]", value: this.renderFieldInputText("author", 50) },
- { label: "[en]Journal[/en][ja]ジャーナル[/ja]", value: this.renderFieldInputText("journal", 50) },
- { label: "[en]Publication Year[/en][ja]出版年[/ja]", value: this.renderFieldInputText("publication_year", 10) },
- { label: "[en]Volume[/en][ja]巻[/ja]", value: this.renderFieldInputText("volume", 50) },
- { label: "[en]Number[/en][ja]号[/ja]", value: this.renderFieldInputText("number", 50) },
- { label: "[en]Page[/en][ja]ページ[/ja]", value: this.renderFieldInputText("page", 50) },
+ { label: 'PubMed ID', value: this.renderFieldInputText('pubmed_id', 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
+ { label: '[en]Author[/en][ja]著者[/ja]', value: this.renderFieldInputText('author', 50) },
+ {
+ label: '[en]Journal[/en][ja]ジャーナル[/ja]',
+ value: this.renderFieldInputText('journal', 50),
+ },
+ {
+ label: '[en]Publication Year[/en][ja]出版年[/ja]',
+ value: this.renderFieldInputText('publication_year', 10),
+ },
+ { label: '[en]Volume[/en][ja]巻[/ja]', value: this.renderFieldInputText('volume', 50) },
+ { label: '[en]Number[/en][ja]号[/ja]', value: this.renderFieldInputText('number', 50) },
+ { label: '[en]Page[/en][ja]ページ[/ja]', value: this.renderFieldInputText('page', 50) },
];
return rows;
}
diff --git a/src/database/item-type/paper/PaperDetail.tsx b/src/database/item-type/paper/PaperDetail.tsx
index 76d0174..e5c1bc3 100644
--- a/src/database/item-type/paper/PaperDetail.tsx
+++ b/src/database/item-type/paper/PaperDetail.tsx
@@ -1,34 +1,63 @@
-import React from "react";
-import Functions from "../../../functions";
-import { ItemPaper } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
-import PaperUtil from "./PaperUtil";
+import Functions from '../../../functions';
+import { ItemPaper } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
+import PaperUtil from './PaperUtil';
class PaperDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemPaper;
return [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value:
- {i > 0 && ", "}
+
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
-
+
);
});
return (
@@ -32,12 +33,12 @@ class PaperList extends ListBase {
{Functions.mlang(item.journal, lang)} {item.publication_year} - {item.volume !== null && " ;" + item.volume} - {item.number !== null && " (" + item.number + ")"} - {item.page !== "" && " :" + item.page} - {item.pubmed_id !== "" && ( + {item.volume !== null && ' ;' + item.volume} + {item.number !== null && ' (' + item.number + ')'} + {item.page !== '' && ' :' + item.page} + {item.pubmed_id !== '' && ( <> - {" "} + {' '} [PMID: = (props: PubmedLinkProps) => {
const { pubmedId } = props;
- if (pubmedId === "") {
+ if (pubmedId === '') {
return null;
}
- const url = "https://www.ncbi.nlm.nih.gov/pubmed/" + pubmedId;
+ const url = 'https://www.ncbi.nlm.nih.gov/pubmed/' + pubmedId;
return (
{pubmedId}
diff --git a/src/database/item-type/paper/index.tsx b/src/database/item-type/paper/index.tsx
index 914b75b..4b8ca3a 100644
--- a/src/database/item-type/paper/index.tsx
+++ b/src/database/item-type/paper/index.tsx
@@ -1,7 +1,7 @@
-import PaperAdvancedSearch from "./PaperAdvancedSearch";
-import PaperDetail from "./PaperDetail";
-import PaperList from "./PaperList";
-import PaperTop from "./PaperTop";
+import PaperAdvancedSearch from './PaperAdvancedSearch';
+import PaperDetail from './PaperDetail';
+import PaperList from './PaperList';
+import PaperTop from './PaperTop';
const ItemTypePaper = {
Top: PaperTop,
diff --git a/src/database/item-type/presentation/PresentationAdvancedSearch.tsx b/src/database/item-type/presentation/PresentationAdvancedSearch.tsx
index 7c2ee52..e76d049 100644
--- a/src/database/item-type/presentation/PresentationAdvancedSearch.tsx
+++ b/src/database/item-type/presentation/PresentationAdvancedSearch.tsx
@@ -1,43 +1,66 @@
-import { ItemPresentationSubTypes } from "../../lib/ItemUtil";
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import { ItemPresentationSubTypes } from '../../lib/ItemUtil';
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class PresentationAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "presentation";
- this.title = "Presentation";
+ this.type = 'presentation';
+ this.title = 'Presentation';
const now = new Date();
const year = String(now.getFullYear());
const month = String(now.getMonth() + 1);
const mday = String(now.getDate());
- this.state.values["title"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
- this.state.values["doi"] = "";
- this.state.values["meeting_name"] = "";
- this.state.values["presentation_type"] = "";
- this.state.values["creator"] = "";
- this.state.values["publication_year"] = year;
- this.state.values["publication_month"] = month;
- this.state.values["publication_mday"] = mday;
- this.state.values["file.preview.caption"] = "";
- this.state.values["file.presentation_file.original_file_name"] = "";
- this.setIgnoreKey("publication_year");
- this.setIgnoreKey("publication_month");
- this.setIgnoreKey("publication_mday");
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
+ this.state.values.meeting_name = '';
+ this.state.values.presentation_type = '';
+ this.state.values.creator = '';
+ this.state.values.publication_year = year;
+ this.state.values.publication_month = month;
+ this.state.values.publication_mday = mday;
+ this.state.values['file.preview.caption'] = '';
+ this.state.values['file.presentation_file.original_file_name'] = '';
+ this.setIgnoreKey('publication_year');
+ this.setIgnoreKey('publication_month');
+ this.setIgnoreKey('publication_mday');
}
getRows() {
const rows = [
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
- { label: "ID", value: this.renderFieldInputText("doi", 50) },
- { label: "[en]Presentation Type[/en][ja]ファイル形式[/ja]", value: this.renderFieldSelect("presentation_type", ItemPresentationSubTypes) },
- { label: "[en]Creator[/en][ja]作成者[/ja]", value: this.renderFieldInputText("creator", 50) },
- { label: "[en]Date[/en][ja]日付[/ja]", value: this.renderFieldDate("", "publication_year", "publication_month", "publication_mday") },
- { label: "[en]Caption[/en][ja]キャプション[/ja]", value: this.renderFieldInputText("file.preview.caption", 50) },
- { label: "[en]Presentation File[/en][ja]発表資料[/ja]", value: this.renderFieldInputText("file.presentation_file.original_file_name", 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
+ {
+ label: '[en]Presentation Type[/en][ja]ファイル形式[/ja]',
+ value: this.renderFieldSelect('presentation_type', ItemPresentationSubTypes),
+ },
+ { label: '[en]Creator[/en][ja]作成者[/ja]', value: this.renderFieldInputText('creator', 50) },
+ {
+ label: '[en]Date[/en][ja]日付[/ja]',
+ value: this.renderFieldDate(
+ '',
+ 'publication_year',
+ 'publication_month',
+ 'publication_mday',
+ ),
+ },
+ {
+ label: '[en]Caption[/en][ja]キャプション[/ja]',
+ value: this.renderFieldInputText('file.preview.caption', 50),
+ },
+ {
+ label: '[en]Presentation File[/en][ja]発表資料[/ja]',
+ value: this.renderFieldInputText('file.presentation_file.original_file_name', 50),
+ },
];
return rows;
}
diff --git a/src/database/item-type/presentation/PresentationDetail.tsx b/src/database/item-type/presentation/PresentationDetail.tsx
index 58dbc31..0d140e3 100644
--- a/src/database/item-type/presentation/PresentationDetail.tsx
+++ b/src/database/item-type/presentation/PresentationDetail.tsx
@@ -1,34 +1,105 @@
-import React from "react";
-import Functions from "../../../functions";
-import { ItemPresentation } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
-import PresentationUtil from "./PresentationUtil";
+import Functions from '../../../functions';
+import { ItemPresentation } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
+import PresentationUtil from './PresentationUtil';
class PresentationDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemPresentation;
return [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value:
- {i > 0 && ", "}
+
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
-
+
);
});
return (
diff --git a/src/database/item-type/presentation/PresentationTop.tsx b/src/database/item-type/presentation/PresentationTop.tsx
index a03c81e..5ab4532 100644
--- a/src/database/item-type/presentation/PresentationTop.tsx
+++ b/src/database/item-type/presentation/PresentationTop.tsx
@@ -1,14 +1,15 @@
-import iconFile from "../../assets/images/icon_presentation.gif";
-import { ItemPresentationSubTypes } from "../../lib/ItemUtil";
-import TopBase, { TopBaseProps } from "../lib/TopBase";
+import iconFile from '../../assets/images/icon_presentation.gif';
+import { ItemPresentationSubTypes } from '../../lib/ItemUtil';
+import TopBase, { TopBaseProps } from '../lib/TopBase';
class PresentationTop extends TopBase {
constructor(props: TopBaseProps) {
super(props);
- this.type = "presentation";
- this.label = "Presentation";
+ this.type = 'presentation';
+ this.label = 'Presentation';
this.icon = iconFile;
- this.description = "[en]Electrical presentation files.[/en][ja]プレゼンテーション ファイル[/ja]";
+ this.description =
+ '[en]Electrical presentation files.[/en][ja]プレゼンテーション ファイル[/ja]';
this.subTypes = ItemPresentationSubTypes;
}
}
diff --git a/src/database/item-type/presentation/PresentationUtil.tsx b/src/database/item-type/presentation/PresentationUtil.tsx
index 8a13b8d..e1358c0 100644
--- a/src/database/item-type/presentation/PresentationUtil.tsx
+++ b/src/database/item-type/presentation/PresentationUtil.tsx
@@ -1,6 +1,6 @@
-import React from "react";
-import { MultiLang } from "../../../config";
-import { ItemPresentationSubType, ItemPresentationSubTypes } from "../../lib/ItemUtil";
+import React from 'react';
+import { MultiLang } from '../../../config';
+import { ItemPresentationSubType, ItemPresentationSubTypes } from '../../lib/ItemUtil';
interface PresentationTypeProps {
lang: MultiLang;
@@ -12,7 +12,7 @@ const PresentationType: React.FC = (props: PresentationTy
const subtype = ItemPresentationSubTypes.find((value) => {
return value.type === type;
});
- if (typeof subtype === "undefined") {
+ if (typeof subtype === 'undefined') {
return null;
}
return {subtype.label};
diff --git a/src/database/item-type/presentation/index.tsx b/src/database/item-type/presentation/index.tsx
index 1a1b016..5274c30 100644
--- a/src/database/item-type/presentation/index.tsx
+++ b/src/database/item-type/presentation/index.tsx
@@ -1,7 +1,7 @@
-import PresentationAdvancedSearch from "./PresentationAdvancedSearch";
-import PresentationDetail from "./PresentationDetail";
-import PresentationList from "./PresentationList";
-import PresentationTop from "./PresentationTop";
+import PresentationAdvancedSearch from './PresentationAdvancedSearch';
+import PresentationDetail from './PresentationDetail';
+import PresentationList from './PresentationList';
+import PresentationTop from './PresentationTop';
const ItemTypePresentation = {
Top: PresentationTop,
diff --git a/src/database/item-type/simulator/SimulatorAdvancedSearch.tsx b/src/database/item-type/simulator/SimulatorAdvancedSearch.tsx
index 672c797..774741d 100644
--- a/src/database/item-type/simulator/SimulatorAdvancedSearch.tsx
+++ b/src/database/item-type/simulator/SimulatorAdvancedSearch.tsx
@@ -1,40 +1,63 @@
-import { ItemSimulatorSubTypes } from "../../lib/ItemUtil";
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import { ItemSimulatorSubTypes } from '../../lib/ItemUtil';
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class SimulatorAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "simulator";
- this.title = "Simulator";
+ this.type = 'simulator';
+ this.title = 'Simulator';
const now = new Date();
const year = String(now.getFullYear());
const month = String(now.getMonth() + 1);
const mday = String(now.getDate());
- this.state.values["title"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
- this.state.values["doi"] = "";
- this.state.values["simulator_type"] = "";
- this.state.values["developer"] = "";
- this.state.values["publication_year"] = year;
- this.state.values["publication_month"] = month;
- this.state.values["publication_mday"] = mday;
- this.state.values["file.preview.caption"] = "";
- this.setIgnoreKey("publication_year");
- this.setIgnoreKey("publication_month");
- this.setIgnoreKey("publication_mday");
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
+ this.state.values.simulator_type = '';
+ this.state.values.developer = '';
+ this.state.values.publication_year = year;
+ this.state.values.publication_month = month;
+ this.state.values.publication_mday = mday;
+ this.state.values['file.preview.caption'] = '';
+ this.setIgnoreKey('publication_year');
+ this.setIgnoreKey('publication_month');
+ this.setIgnoreKey('publication_mday');
}
getRows() {
const rows = [
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
- { label: "ID", value: this.renderFieldInputText("doi", 50) },
- { label: "[en]Simulator Type[/en][ja]シミュレータータイプ[/ja]", value: this.renderFieldSelect("simulator_type", ItemSimulatorSubTypes) },
- { label: "[en]Developer[/en][ja]開発者[/ja]", value: this.renderFieldInputText("developer", 50) },
- { label: "[en]Date[/en][ja]日付[/ja]", value: this.renderFieldDate("", "publication_year", "publication_month", "publication_mday") },
- { label: "[en]Caption[/en][ja]キャプション[/ja]", value: this.renderFieldInputText("file.preview.caption", 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
+ {
+ label: '[en]Simulator Type[/en][ja]シミュレータータイプ[/ja]',
+ value: this.renderFieldSelect('simulator_type', ItemSimulatorSubTypes),
+ },
+ {
+ label: '[en]Developer[/en][ja]開発者[/ja]',
+ value: this.renderFieldInputText('developer', 50),
+ },
+ {
+ label: '[en]Date[/en][ja]日付[/ja]',
+ value: this.renderFieldDate(
+ '',
+ 'publication_year',
+ 'publication_month',
+ 'publication_mday',
+ ),
+ },
+ {
+ label: '[en]Caption[/en][ja]キャプション[/ja]',
+ value: this.renderFieldInputText('file.preview.caption', 50),
+ },
];
return rows;
}
diff --git a/src/database/item-type/simulator/SimulatorDetail.tsx b/src/database/item-type/simulator/SimulatorDetail.tsx
index 4afbfcc..8feec1b 100644
--- a/src/database/item-type/simulator/SimulatorDetail.tsx
+++ b/src/database/item-type/simulator/SimulatorDetail.tsx
@@ -1,39 +1,113 @@
-import React from "react";
-import Functions from "../../../functions";
-import ItemUtil, { ItemSimulator } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
-import SimPFLinkIcon from "../lib/field/SimPFLinkIcon";
-import SimulatorUtil from "./SimulatorUtil";
+import Functions from '../../../functions';
+import ItemUtil, { ItemSimulator } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
+import SimPFLinkIcon from '../lib/field/SimPFLinkIcon';
+import SimulatorUtil from './SimulatorUtil';
class SimulatorDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemSimulator;
const fields = [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value:
- {i > 0 && ", "}
+
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
-
+
);
});
return (
diff --git a/src/database/item-type/simulator/SimulatorTop.tsx b/src/database/item-type/simulator/SimulatorTop.tsx
index d752c35..bb56204 100644
--- a/src/database/item-type/simulator/SimulatorTop.tsx
+++ b/src/database/item-type/simulator/SimulatorTop.tsx
@@ -1,14 +1,15 @@
-import iconFile from "../../assets/images/icon_simulator.gif";
-import { ItemSimulatorSubTypes } from "../../lib/ItemUtil";
-import TopBase, { TopBaseProps } from "../lib/TopBase";
+import iconFile from '../../assets/images/icon_simulator.gif';
+import { ItemSimulatorSubTypes } from '../../lib/ItemUtil';
+import TopBase, { TopBaseProps } from '../lib/TopBase';
class SimulatorTop extends TopBase {
constructor(props: TopBaseProps) {
super(props);
- this.type = "simulator";
- this.label = "Simulator";
+ this.type = 'simulator';
+ this.label = 'Simulator';
this.icon = iconFile;
- this.description = "[en]Programs/scripts for simulation.[/en][ja]シミュレーション用プログラム/スクリプト[/ja]";
+ this.description =
+ '[en]Programs/scripts for simulation.[/en][ja]シミュレーション用プログラム/スクリプト[/ja]';
this.subTypes = ItemSimulatorSubTypes;
}
}
diff --git a/src/database/item-type/simulator/SimulatorUtil.tsx b/src/database/item-type/simulator/SimulatorUtil.tsx
index 79f56e1..ff4d854 100644
--- a/src/database/item-type/simulator/SimulatorUtil.tsx
+++ b/src/database/item-type/simulator/SimulatorUtil.tsx
@@ -1,6 +1,5 @@
-import React from "react";
-import { MultiLang } from "../../../config";
-import { ItemSimulatorSubType, ItemSimulatorSubTypes } from "../../lib/ItemUtil";
+import { MultiLang } from '../../../config';
+import { ItemSimulatorSubType, ItemSimulatorSubTypes } from '../../lib/ItemUtil';
interface SimulatorTypeProps {
lang: MultiLang;
@@ -12,7 +11,7 @@ const SimulatorType = (props: SimulatorTypeProps) => {
const subtype = ItemSimulatorSubTypes.find((value) => {
return value.type === type;
});
- if (typeof subtype === "undefined") {
+ if (typeof subtype === 'undefined') {
return null;
}
return {subtype.label};
diff --git a/src/database/item-type/simulator/index.tsx b/src/database/item-type/simulator/index.tsx
index 566210b..333cdd6 100644
--- a/src/database/item-type/simulator/index.tsx
+++ b/src/database/item-type/simulator/index.tsx
@@ -1,7 +1,7 @@
-import SimulatorAdvancedSearch from "./SimulatorAdvancedSearch";
-import SimulatorDetail from "./SimulatorDetail";
-import SimulatorList from "./SimulatorList";
-import SimulatorTop from "./SimulatorTop";
+import SimulatorAdvancedSearch from './SimulatorAdvancedSearch';
+import SimulatorDetail from './SimulatorDetail';
+import SimulatorList from './SimulatorList';
+import SimulatorTop from './SimulatorTop';
const ItemTypeSimulator = {
Top: SimulatorTop,
diff --git a/src/database/item-type/stimulus/StimulusAdvancedSearch.tsx b/src/database/item-type/stimulus/StimulusAdvancedSearch.tsx
index ae061c2..a405f8d 100644
--- a/src/database/item-type/stimulus/StimulusAdvancedSearch.tsx
+++ b/src/database/item-type/stimulus/StimulusAdvancedSearch.tsx
@@ -1,40 +1,63 @@
-import { ItemStimulusSubTypes } from "../../lib/ItemUtil";
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import { ItemStimulusSubTypes } from '../../lib/ItemUtil';
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class StimulusAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "stimulus";
- this.title = "Stimulus";
+ this.type = 'stimulus';
+ this.title = 'Stimulus';
const now = new Date();
const year = String(now.getFullYear());
const month = String(now.getMonth() + 1);
const mday = String(now.getDate());
- this.state.values["title"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
- this.state.values["doi"] = "";
- this.state.values["stimulus_type"] = "";
- this.state.values["developer"] = "";
- this.state.values["publication_year"] = year;
- this.state.values["publication_month"] = month;
- this.state.values["publication_mday"] = mday;
- this.state.values["file.preview.caption"] = "";
- this.setIgnoreKey("publication_year");
- this.setIgnoreKey("publication_month");
- this.setIgnoreKey("publication_mday");
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
+ this.state.values.stimulus_type = '';
+ this.state.values.developer = '';
+ this.state.values.publication_year = year;
+ this.state.values.publication_month = month;
+ this.state.values.publication_mday = mday;
+ this.state.values['file.preview.caption'] = '';
+ this.setIgnoreKey('publication_year');
+ this.setIgnoreKey('publication_month');
+ this.setIgnoreKey('publication_mday');
}
getRows() {
const rows = [
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
- { label: "ID", value: this.renderFieldInputText("doi", 50) },
- { label: "[en]Stimulus Type[/en][ja]刺激タイプ[/ja]", value: this.renderFieldSelect("stimulus_type", ItemStimulusSubTypes) },
- { label: "[en]Developer[/en][ja]開発者[/ja]", value: this.renderFieldInputText("developer", 50) },
- { label: "[en]Date[/en][ja]日付[/ja]", value: this.renderFieldDate("", "publication_year", "publication_month", "publication_mday") },
- { label: "[en]Caption[/en][ja]キャプション[/ja]", value: this.renderFieldInputText("file.preview.caption", 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
+ {
+ label: '[en]Stimulus Type[/en][ja]刺激タイプ[/ja]',
+ value: this.renderFieldSelect('stimulus_type', ItemStimulusSubTypes),
+ },
+ {
+ label: '[en]Developer[/en][ja]開発者[/ja]',
+ value: this.renderFieldInputText('developer', 50),
+ },
+ {
+ label: '[en]Date[/en][ja]日付[/ja]',
+ value: this.renderFieldDate(
+ '',
+ 'publication_year',
+ 'publication_month',
+ 'publication_mday',
+ ),
+ },
+ {
+ label: '[en]Caption[/en][ja]キャプション[/ja]',
+ value: this.renderFieldInputText('file.preview.caption', 50),
+ },
];
return rows;
}
diff --git a/src/database/item-type/stimulus/StimulusDetail.tsx b/src/database/item-type/stimulus/StimulusDetail.tsx
index c75846d..9ba56de 100644
--- a/src/database/item-type/stimulus/StimulusDetail.tsx
+++ b/src/database/item-type/stimulus/StimulusDetail.tsx
@@ -1,39 +1,113 @@
-import React from "react";
-import Functions from "../../../functions";
-import ItemUtil, { ItemStimulus } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
-import SimPFLinkIcon from "../lib/field/SimPFLinkIcon";
-import StimulusUtil from "./StimulusUtil";
+import Functions from '../../../functions';
+import ItemUtil, { ItemStimulus } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
+import SimPFLinkIcon from '../lib/field/SimPFLinkIcon';
+import StimulusUtil from './StimulusUtil';
class StimulusDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemStimulus;
const fields = [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value:
- {i > 0 && ", "}
+
+ {i > 0 && ', '}
{Functions.mlang(author, lang)}
-
+
);
});
return (
diff --git a/src/database/item-type/stimulus/StimulusTop.tsx b/src/database/item-type/stimulus/StimulusTop.tsx
index 322c442..d395417 100644
--- a/src/database/item-type/stimulus/StimulusTop.tsx
+++ b/src/database/item-type/stimulus/StimulusTop.tsx
@@ -1,14 +1,15 @@
-import iconFile from "../../assets/images/icon_stimulus.gif";
-import { ItemStimulusSubTypes } from "../../lib/ItemUtil";
-import TopBase, { TopBaseProps } from "../lib/TopBase";
+import iconFile from '../../assets/images/icon_stimulus.gif';
+import { ItemStimulusSubTypes } from '../../lib/ItemUtil';
+import TopBase, { TopBaseProps } from '../lib/TopBase';
class StimulusTop extends TopBase {
constructor(props: TopBaseProps) {
super(props);
- this.type = "stimulus";
- this.label = "Stimulus";
+ this.type = 'stimulus';
+ this.label = 'Stimulus';
this.icon = iconFile;
- this.description = "[en]Picture, movie and program files for experimental stimuli.[/en][ja]実験用刺激プログラム/スクリプト[/ja]";
+ this.description =
+ '[en]Picture, movie and program files for experimental stimuli.[/en][ja]実験用刺激プログラム/スクリプト[/ja]';
this.subTypes = ItemStimulusSubTypes;
}
}
diff --git a/src/database/item-type/stimulus/StimulusUtil.tsx b/src/database/item-type/stimulus/StimulusUtil.tsx
index ac15d75..035a32d 100644
--- a/src/database/item-type/stimulus/StimulusUtil.tsx
+++ b/src/database/item-type/stimulus/StimulusUtil.tsx
@@ -1,6 +1,5 @@
-import React from "react";
-import { MultiLang } from "../../../config";
-import { ItemStimulusSubType, ItemStimulusSubTypes } from "../../lib/ItemUtil";
+import { MultiLang } from '../../../config';
+import { ItemStimulusSubType, ItemStimulusSubTypes } from '../../lib/ItemUtil';
interface StimulusTypeProps {
lang: MultiLang;
@@ -12,7 +11,7 @@ const StimulusType = (props: StimulusTypeProps) => {
const subtype = ItemStimulusSubTypes.find((value) => {
return value.type === type;
});
- if (typeof subtype === "undefined") {
+ if (typeof subtype === 'undefined') {
return null;
}
return {subtype.label};
diff --git a/src/database/item-type/stimulus/index.tsx b/src/database/item-type/stimulus/index.tsx
index 3aea68e..7a1df0b 100644
--- a/src/database/item-type/stimulus/index.tsx
+++ b/src/database/item-type/stimulus/index.tsx
@@ -1,7 +1,7 @@
-import StimulusAdvancedSearch from "./StimulusAdvancedSearch";
-import StimulusDetail from "./StimulusDetail";
-import StimulusList from "./StimulusList";
-import StimulusTop from "./StimulusTop";
+import StimulusAdvancedSearch from './StimulusAdvancedSearch';
+import StimulusDetail from './StimulusDetail';
+import StimulusList from './StimulusList';
+import StimulusTop from './StimulusTop';
const ItemTypeStimulus = {
Top: StimulusTop,
diff --git a/src/database/item-type/tool/ToolAdvancedSearch.tsx b/src/database/item-type/tool/ToolAdvancedSearch.tsx
index 6c9a8d3..5d4b571 100644
--- a/src/database/item-type/tool/ToolAdvancedSearch.tsx
+++ b/src/database/item-type/tool/ToolAdvancedSearch.tsx
@@ -2,45 +2,70 @@ import { ItemToolSubTypes } from '../../lib/ItemUtil';
import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class ToolAdvancedSearch extends AdvancedSearchBase {
+ constructor(props: AdvancedSearchBaseProps) {
+ super(props);
+ this.type = 'tool';
+ this.title = 'Tool';
+ const now = new Date();
+ const year = String(now.getFullYear());
+ const month = String(now.getMonth() + 1);
+ const mday = String(now.getDate());
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
+ this.state.values.tool_type = '';
+ this.state.values.developer = '';
+ this.state.values.publication_year = year;
+ this.state.values.publication_month = month;
+ this.state.values.publication_mday = mday;
+ this.state.values['file.preview.caption'] = '';
+ this.state.values['file.tool_data.original_file_name'] = '';
+ this.setIgnoreKey('publication_year');
+ this.setIgnoreKey('publication_month');
+ this.setIgnoreKey('publication_mday');
+ }
- constructor(props: AdvancedSearchBaseProps) {
- super(props);
- this.type = 'tool';
- this.title = 'Tool';
- const now = new Date();
- const year = String(now.getFullYear());
- const month = String(now.getMonth() + 1);
- const mday = String(now.getDate());
- this.state.values['title'] = '';
- this.state.values['keyword'] = '';
- this.state.values['description'] = '';
- this.state.values['doi'] = '';
- this.state.values['tool_type'] = '';
- this.state.values['developer'] = '';
- this.state.values['publication_year'] = year;
- this.state.values['publication_month'] = month;
- this.state.values['publication_mday'] = mday;
- this.state.values['file.preview.caption'] = '';
- this.state.values['file.tool_data.original_file_name'] = '';
- this.setIgnoreKey('publication_year');
- this.setIgnoreKey('publication_month');
- this.setIgnoreKey('publication_mday');
- }
-
- getRows() {
- const rows = [
- { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
- { label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]', value: this.renderFieldInputText('keyword', 50) },
- { label: '[en]Description[/en][ja]概要[/ja]', value: this.renderFieldInputText('description', 50) },
- { label: 'ID', value: this.renderFieldInputText('doi', 50) },
- { label: '[en]Tool Type[/en][ja]ファイルタイプ[/ja]', value: this.renderFieldSelect('tool_type', ItemToolSubTypes) },
- { label: '[en]Developer[/en][ja]開発者[/ja]', value: this.renderFieldInputText('developer', 50) },
- { label: '[en]Date[/en][ja]日付[/ja]', value: this.renderFieldDate('', 'publication_year', 'publication_month', 'publication_mday') },
- { label: '[en]Caption[/en][ja]キャプション[/ja]', value: this.renderFieldInputText('file.preview.caption', 50) },
- { label: '[en]Tool File[/en][ja]ファイル[/ja]', value: this.renderFieldInputText('file.tool_data.original_file_name', 50) },
- ];
- return rows;
- }
+ getRows() {
+ const rows = [
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
+ {
+ label: '[en]Tool Type[/en][ja]ファイルタイプ[/ja]',
+ value: this.renderFieldSelect('tool_type', ItemToolSubTypes),
+ },
+ {
+ label: '[en]Developer[/en][ja]開発者[/ja]',
+ value: this.renderFieldInputText('developer', 50),
+ },
+ {
+ label: '[en]Date[/en][ja]日付[/ja]',
+ value: this.renderFieldDate(
+ '',
+ 'publication_year',
+ 'publication_month',
+ 'publication_mday',
+ ),
+ },
+ {
+ label: '[en]Caption[/en][ja]キャプション[/ja]',
+ value: this.renderFieldInputText('file.preview.caption', 50),
+ },
+ {
+ label: '[en]Tool File[/en][ja]ファイル[/ja]',
+ value: this.renderFieldInputText('file.tool_data.original_file_name', 50),
+ },
+ ];
+ return rows;
+ }
}
export default ToolAdvancedSearch;
diff --git a/src/database/item-type/tool/ToolDetail.tsx b/src/database/item-type/tool/ToolDetail.tsx
index 866ee3f..bdbfce2 100644
--- a/src/database/item-type/tool/ToolDetail.tsx
+++ b/src/database/item-type/tool/ToolDetail.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import Functions from '../../../functions';
import ItemUtil, { ItemTool } from '../../lib/ItemUtil';
import DetailBase from '../lib/DetailBase';
@@ -7,37 +6,101 @@ import SimPFLinkIcon from '../lib/field/SimPFLinkIcon';
import ToolUtil from './ToolUtil';
class ToolDetail extends DetailBase {
-
- getFields() {
- const { lang, type } = this.props;
- const item = this.props.item as ItemTool;
- const fields = [
- { label: 'ID', value: item.doi },
- { label: '[en]Language[/en][ja]言語[/ja]', value:
-
+
- Link to {item.url} - - ); - } + renderBody() { + const { lang } = this.props; + const item = this.props.item as ItemUrl; + return ( + <> + {Functions.mlang(item.title, lang)} +
+ Link to{' '} + + {item.url} + + + ); + } } -export default UrlList; \ No newline at end of file +export default UrlList; diff --git a/src/database/item-type/url/UrlTop.tsx b/src/database/item-type/url/UrlTop.tsx index ed0c472..7737780 100644 --- a/src/database/item-type/url/UrlTop.tsx +++ b/src/database/item-type/url/UrlTop.tsx @@ -2,14 +2,13 @@ import TopBase, { TopBaseProps } from '../lib/TopBase'; import iconFile from '../../assets/images/icon_url.gif'; class UrlTop extends TopBase { - - constructor(props: TopBaseProps) { - super(props); - this.type = 'url'; - this.label = 'Url'; - this.icon = iconFile; - this.description = '[en]Link information.[/en][ja]関連リンク[/ja]'; - } + constructor(props: TopBaseProps) { + super(props); + this.type = 'url'; + this.label = 'Url'; + this.icon = iconFile; + this.description = '[en]Link information.[/en][ja]関連リンク[/ja]'; + } } -export default UrlTop; \ No newline at end of file +export default UrlTop; diff --git a/src/database/item-type/url/UrlUtil.tsx b/src/database/item-type/url/UrlUtil.tsx index 09d5be6..7dd4090 100644 --- a/src/database/item-type/url/UrlUtil.tsx +++ b/src/database/item-type/url/UrlUtil.tsx @@ -1,29 +1,30 @@ -import React from 'react'; -import { MultiLang, BrainAtlasType } from '../../../config'; +import { BrainAtlasType, MultiLang } from '../../../config'; import ItemUtil, { ItemBasicFile } from '../../lib/ItemUtil'; interface BannerFileProps { - lang: MultiLang; - file: ItemBasicFile[]; - type: BrainAtlasType; + lang: MultiLang; + file: ItemBasicFile[]; + type: BrainAtlasType; } const BannerFile = (props: BannerFileProps) => { - const { file, type } = props; - const data = file.find((value) => { - return value.file_type_name === 'url_banner_file'; - }); - if (typeof data === 'undefined') { - return null; - } - const url = ItemUtil.getFileUrl(type, data); - return ( -
- );
-}
+ const { file, type } = props;
+ const data = file.find((value) => {
+ return value.file_type_name === 'url_banner_file';
+ });
+ if (typeof data === 'undefined') {
+ return null;
+ }
+ const url = ItemUtil.getFileUrl(type, data);
+ return (
+
+
+
+ );
+};
const UrlUtil = {
- BannerFile,
-}
+ BannerFile,
+};
export default UrlUtil;
diff --git a/src/database/item-type/url/index.tsx b/src/database/item-type/url/index.tsx
index b359df2..fd71bc8 100644
--- a/src/database/item-type/url/index.tsx
+++ b/src/database/item-type/url/index.tsx
@@ -4,10 +4,10 @@ import UrlDetail from './UrlDetail';
import UrlAdvancedSearch from './UrlAdvancedSearch';
const ItemTypeUrl = {
- Top: UrlTop,
- List: UrlList,
- Detail: UrlDetail,
- AdvancedSearch: UrlAdvancedSearch,
+ Top: UrlTop,
+ List: UrlList,
+ Detail: UrlDetail,
+ AdvancedSearch: UrlAdvancedSearch,
};
export default ItemTypeUrl;
diff --git a/src/database/lib/AdvancedSearchQuery.ts b/src/database/lib/AdvancedSearchQuery.ts
index 0b69c84..d0bb66f 100644
--- a/src/database/lib/AdvancedSearchQuery.ts
+++ b/src/database/lib/AdvancedSearchQuery.ts
@@ -1,3 +1,5 @@
+import { LokiSearchFilter } from './types';
+
type AdvancedSearchQueryData = Map;
class AdvancedSearchQuery {
@@ -19,7 +21,9 @@ class AdvancedSearchQuery {
set(type: string, key: string, value: string) {
type = type.trim();
key = key.trim();
- const data: URLSearchParams = this.dataset.has(type) ? (this.dataset.get(type) as URLSearchParams) : new URLSearchParams();
+ const data: URLSearchParams = this.dataset.has(type)
+ ? this.dataset.get(type)!
+ : new URLSearchParams();
data.set(key, value);
this.dataset.set(type, data);
}
@@ -27,7 +31,9 @@ class AdvancedSearchQuery {
delete(type: string, key: string) {
type = type.trim();
key = key.trim();
- const data: URLSearchParams = this.dataset.has(type) ? (this.dataset.get(type) as URLSearchParams) : new URLSearchParams();
+ const data: URLSearchParams = this.dataset.has(type)
+ ? this.dataset.get(type)!
+ : new URLSearchParams();
data.delete(key);
this.dataset.set(type, data);
}
@@ -38,11 +44,11 @@ class AdvancedSearchQuery {
}
getQueryParams() {
- let ret: URLSearchParams = new URLSearchParams();
+ const ret: URLSearchParams = new URLSearchParams();
this.dataset.forEach((data, type) => {
data.forEach((value, key) => {
value = value.trim();
- value.length > 0 && ret.set(type + "." + key, value);
+ value.length > 0 && ret.set(type + '.' + key, value);
});
});
return ret;
@@ -51,23 +57,23 @@ class AdvancedSearchQuery {
setByQueryString(queryString: string) {
const query = new URLSearchParams(queryString);
query.forEach((v, k) => {
- const [type, ...key] = k.split(".");
- if (typeof key === "undefined") {
+ const [type, ...key] = k.split('.');
+ if (typeof key === 'undefined') {
return;
}
- this.set(type, key.join("."), v);
+ this.set(type, key.join('.'), v);
});
}
- getSearchFilter() {
- let filter: any = [];
+ getSearchFilter(): LokiSearchFilter {
+ const filter: LokiSearchFilter[] = [];
this.dataset.forEach((data, type) => {
- let filter2: any = [];
+ const filter2: LokiSearchFilter[] = [];
filter2.push({
- item_type_name: "xnp" + type,
+ item_type_name: 'xnp' + type,
});
data.forEach((value, key) => {
- const regex = value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+ const regex = value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
const file = key.match(/^file\.([^.]+)\.([^.]+)$/);
if (file !== null) {
const fileType = file[1];
@@ -79,10 +85,10 @@ class AdvancedSearchQuery {
// [subKey]: { '$regex': regex }
// };
// filter2.push({ file: { '$elemMatch': filter3 } });
- filter2.push({ "file.file_type_name": fileType });
- filter2.push({ ["file." + subKey]: { $regex: [regex, "i"] } });
+ filter2.push({ 'file.file_type_name': fileType });
+ filter2.push({ ['file.' + subKey]: { $regex: [regex, 'i'] } });
} else {
- filter2.push({ [key]: { $regex: [regex, "i"] } });
+ filter2.push({ [key]: { $regex: [regex, 'i'] } });
}
});
filter.push({ $and: filter2 });
diff --git a/src/database/lib/DatabaseListIndex.tsx b/src/database/lib/DatabaseListIndex.tsx
index 4cd8bc9..1471523 100644
--- a/src/database/lib/DatabaseListIndex.tsx
+++ b/src/database/lib/DatabaseListIndex.tsx
@@ -1,9 +1,10 @@
-import React from "react";
-import { Link } from "react-router-dom";
-import { BrainAtlasType, MultiLang } from "../../config";
-import Functions from "../../functions";
-import iconFile from "../assets/images/icon_folder.gif";
-import IndexUtil, { Index } from "./IndexUtil";
+import React from 'react';
+
+import { Link } from 'react-router-dom';
+import { BrainAtlasType, MultiLang } from '../../config';
+import Functions from '../../functions';
+import iconFile from '../assets/images/icon_folder.gif';
+import IndexUtil, { Index } from './IndexUtil';
interface Props {
lang: MultiLang;
@@ -11,11 +12,18 @@ interface Props {
type: BrainAtlasType;
}
-const ListIndexItem: React.FC = (props: Props) => {
+const ListIndexItem: React.FC = (props) => {
const { lang, index, type } = props;
const url = IndexUtil.getUrl(type, index.id);
const title = Functions.mlang(index.title, lang);
- const numOfIndexes = IndexUtil.countChildren(type, index.id);
+ const [numOfIndexes, setNumOfIndexes] = React.useState(0);
+
+ React.useEffect(() => {
+ IndexUtil.countChildren(type, index.id, (count) => {
+ setNumOfIndexes(count);
+ });
+ }, [index.id, type]);
+
return (
@@ -36,14 +44,22 @@ const ListIndexItem: React.FC
);
- }
+ };
- renderPageNavi(result: SearchResult) {
- const maxPage = Math.floor(result.total / this.state.condition.limit) + (result.total % this.state.condition.limit !== 0 ? 1 : 0);
+ const renderPageNavi = (result: SearchResult) => {
+ const maxPage =
+ Math.floor(result.total / condition.limit) + (result.total % condition.limit !== 0 ? 1 : 0);
const link = (title: string, page: number, id: string) => {
- if (page === 0 || page === this.state.condition.page) {
+ if (page === 0 || page === condition.page) {
return (
{title}
);
}
- const url: string = this.getListUrl({ page: page });
+ const url: string = getListUrl({ page: page });
return (
{title}
);
};
- let startPage = this.state.condition.page - 4 > 1 ? this.state.condition.page - 4 : 1;
+ let startPage = condition.page - 4 > 1 ? condition.page - 4 : 1;
const endPage = startPage + 9 > maxPage ? maxPage : startPage + 9;
if (endPage - startPage < 9) {
startPage = endPage - 9 > 0 ? endPage - 9 : 1;
}
- let pageLinks: JSX.Element[] = [];
- pageLinks.push(link("PREV", this.state.condition.page - 1, "p"));
+ const pageLinks: JSX.Element[] = [];
+ pageLinks.push(link('PREV', condition.page - 1, 'p'));
for (let i = startPage; i <= endPage; i++) {
pageLinks.push(link(String(i), i, String(i)));
}
- pageLinks.push(link("NEXT", this.state.condition.page >= maxPage ? 0 : this.state.condition.page + 1, "n"));
+ pageLinks.push(link('NEXT', condition.page >= maxPage ? 0 : condition.page + 1, 'n'));
return
-
-
-
- );
- });
+ if (loading) {
+ return
- {items}
-
- {pageNavi}
-
+
+
+
+
);
- }
-}
-
-const DatabaseListItemFC: React.FC = (props: PropsFC) => {
- const { lang, type, url, search } = props;
- return
+ {items}
+
+ {pageNavi}
+
+ );
};
-export default DatabaseListItemFC;
+export default DatabaseListItem;
diff --git a/src/database/lib/IndexUtil.ts b/src/database/lib/IndexUtil.ts
index d94e95c..b34205e 100644
--- a/src/database/lib/IndexUtil.ts
+++ b/src/database/lib/IndexUtil.ts
@@ -1,6 +1,8 @@
-import loki from "lokijs";
-import { BrainAtlasType } from "../../config.js";
-import treesJson from "../assets/trees.json";
+import AsyncLock from 'async-lock';
+import axios from 'axios';
+import loki from 'lokijs';
+import { BrainAtlasType, BrainAtlasTypes } from '../../config.js';
+import { LokiSearchFilter } from './types.js';
export interface Index {
id: number;
@@ -21,97 +23,146 @@ interface IndexData {
}
type IndexesData = IndexData[];
-interface TreeJson {
- type: BrainAtlasType;
- tree: IndexesData;
-}
-type TreesJson = TreeJson[];
+export type GetCallbackFunc = (index: Index | null) => void;
+export type SearchCallbackFunc = (indexes: Index[]) => void;
+export type CountCallbackFunc = (count: number) => void;
+
+type IndexLoadCallbackFunc = (indexes: Collection) => void;
class IndexUtil {
private database: loki;
private indexes: Map>;
+ private loading: Map;
+ private callbacks: Map;
- constructor(trees: TreesJson) {
- this.database = new loki("database");
+ constructor() {
+ this.database = new loki('database', { env: 'BROWSER' });
this.indexes = new Map>();
- trees.forEach((tree) => {
- const collection = this.database.addCollection(tree.type + "_indexes");
- this.load(tree.tree, collection);
- this.indexes.set(tree.type, collection);
+ this.loading = new Map();
+ this.callbacks = new Map();
+ this.load();
+ }
+
+ load(): void {
+ BrainAtlasTypes.forEach((type) => {
+ const collection = this.database.addCollection(type + '_indexes');
+ this.indexes.set(type, collection);
+ this.loading.set(type, true);
+ this.callbacks.set(type, []);
+ axios
+ .get(`/data/${type}/tree.json`, { responseType: 'json' })
+ .then((response) => {
+ const store = (indexesData: IndexesData, parentId: number) => {
+ indexesData.forEach((indexData: IndexData, idx) => {
+ const entry: Index = {
+ id: indexData.id,
+ title: indexData.title,
+ numOfItems: indexData.num_of_items,
+ parentId: parentId,
+ weight: idx,
+ };
+ collection.insert(entry);
+ store(indexData.children, indexData.id);
+ });
+ };
+ store(response.data, INDEX_ID_ROOT);
+ const lock = new AsyncLock();
+ lock.acquire(
+ `${type}_indexes`,
+ () => {
+ this.loading.set(type, false);
+ const callbacks = this.callbacks.get(type);
+ if (typeof callbacks !== 'undefined') {
+ callbacks.forEach((callback) => {
+ callback(collection);
+ });
+ this.callbacks.set(type, []);
+ }
+ },
+ () => {
+ // ignore
+ },
+ );
+ })
+ .catch(() => {
+ // ignore
+ });
});
}
- load(json: IndexesData, collection: Collection): void {
- const store = (indexesData: IndexesData, parentId: number) => {
- indexesData.forEach((indexData: IndexData, idx) => {
- const entry: Index = {
- id: indexData.id,
- title: indexData.title,
- numOfItems: indexData.num_of_items,
- parentId: parentId,
- weight: idx,
- };
- collection.insert(entry);
- store(indexData.children, indexData.id);
- });
- };
- store(json, INDEX_ID_ROOT);
+ registerIndexLoadCallback(type: BrainAtlasType, func: IndexLoadCallbackFunc): void {
+ const lock = new AsyncLock();
+ lock.acquire(
+ `${type}_indexes`,
+ () => {
+ if (this.loading.get(type)) {
+ const callbacks = this.callbacks.get(type);
+ if (typeof callbacks !== 'undefined') {
+ callbacks.push(func);
+ }
+ } else {
+ const collection = this.indexes.get(type);
+ if (typeof collection !== 'undefined') {
+ func(collection);
+ }
+ }
+ },
+ () => {
+ // ignore
+ },
+ );
}
getUrl(type: BrainAtlasType, id: number): string {
- return "/" + type + "/modules/xoonips/listitem.php?index_id=" + String(id);
+ return '/' + type + '/modules/xoonips/listitem.php?index_id=' + String(id);
}
- get(type: BrainAtlasType, indexId: number): Index | null {
- const filter = {
- id: indexId,
- };
- const collection = this.indexes.get(type);
- if (typeof collection === "undefined") {
- return null;
- }
- const res = collection.findOne(filter);
- return res;
+ get(type: BrainAtlasType, indexId: number, func: GetCallbackFunc): void {
+ this.registerIndexLoadCallback(type, (indexes) => {
+ const filter: LokiSearchFilter = {
+ id: indexId,
+ };
+ const index = indexes.findOne(filter);
+ func(index);
+ });
}
- getChildren(type: BrainAtlasType, indexId: number): Index[] {
- const filter = {
- parentId: indexId,
- };
- const collection = this.indexes.get(type);
- if (typeof collection === "undefined") {
- return [];
- }
- const res = collection.chain().find(filter).simplesort("weight").data();
- return res;
+ getChildren(type: BrainAtlasType, indexId: number, func: SearchCallbackFunc): void {
+ this.registerIndexLoadCallback(type, (indexes) => {
+ const filter: LokiSearchFilter = {
+ parentId: indexId,
+ };
+ const children = indexes.chain().find(filter).simplesort('weight').data();
+ func(children);
+ });
}
- countChildren(type: BrainAtlasType, indexId: number): number {
- const filter = {
- parentId: indexId,
- };
- const collection = this.indexes.get(type);
- if (typeof collection === "undefined") {
- return 0;
- }
- const res = collection.count(filter);
- return res;
+ countChildren(type: BrainAtlasType, indexId: number, func: CountCallbackFunc): void {
+ this.registerIndexLoadCallback(type, (indexes) => {
+ const filter: LokiSearchFilter = {
+ parentId: indexId,
+ };
+ const count = indexes.count(filter);
+ func(count);
+ });
}
- getParents(type: BrainAtlasType, parentId: number): Index[] {
- let parents: Index[] = [];
- const loop = (parentId: number) => {
- if (parentId !== INDEX_ID_ROOT) {
- const parent = this.get(type, parentId);
- if (parent !== null) {
- loop(parent.parentId);
- parents.push(parent);
- }
+ getParents(type: BrainAtlasType, parentId: number, func: SearchCallbackFunc): void {
+ const parents: Index[] = [];
+ const loop = (parentId: number, func: SearchCallbackFunc) => {
+ if (parentId === INDEX_ID_ROOT) {
+ func(parents);
+ } else {
+ this.get(type, parentId, (parent) => {
+ if (parent != null) {
+ loop(parent.parentId, func);
+ parents.push(parent);
+ }
+ });
}
};
- loop(parentId);
- return parents;
+ loop(parentId, func);
}
}
-export default new IndexUtil(treesJson as TreesJson);
+export default new IndexUtil();
diff --git a/src/database/lib/ItemUtil.ts b/src/database/lib/ItemUtil.ts
index 3f31219..bd9d62c 100644
--- a/src/database/lib/ItemUtil.ts
+++ b/src/database/lib/ItemUtil.ts
@@ -1,10 +1,11 @@
-import AsyncLock from "async-lock";
-import axios from "axios";
-import loki from "lokijs";
-import { BrainAtlasType, BrainAtlasTypes } from "../../config";
-import Functions from "../../functions";
-import simpfLinksJson from "../assets/simpf-links.json";
-import AdvancedSearchQuery from "./AdvancedSearchQuery";
+import AsyncLock from 'async-lock';
+import axios from 'axios';
+import loki from 'lokijs';
+import { BrainAtlasType, BrainAtlasTypes } from '../../config';
+import Functions from '../../functions';
+import simpfLinksJson from '../assets/simpf-links.json';
+import AdvancedSearchQuery from './AdvancedSearchQuery';
+import { LokiSearchFilter } from './types';
interface SimPFLink {
id: number;
@@ -18,7 +19,21 @@ interface ItemSubType {
export type ItemSubTypes = readonly ItemSubType[];
-export type ItemBasicLang = "eng" | "jpn" | "fra" | "deu" | "esl" | "ita" | "dut" | "sve" | "nor" | "dan" | "fin" | "por" | "chi" | "kor";
+export type ItemBasicLang =
+ | 'eng'
+ | 'jpn'
+ | 'fra'
+ | 'deu'
+ | 'esl'
+ | 'ita'
+ | 'dut'
+ | 'sve'
+ | 'nor'
+ | 'dan'
+ | 'fin'
+ | 'por'
+ | 'chi'
+ | 'kor';
export interface ItemBasicIndex {
index_id: number;
title: string;
@@ -69,7 +84,7 @@ export interface ItemBinder extends ItemBasic {
}
export interface ItemBook extends ItemBasic {
- classfication: string;
+ classification: string;
editor: string;
publisher: string;
isbn: string;
@@ -79,12 +94,12 @@ export interface ItemBook extends ItemBasic {
author: string[];
}
-export type ItemConferenceSubType = "powerpoint" | "pdf" | "illustrator" | "other";
+export type ItemConferenceSubType = 'powerpoint' | 'pdf' | 'illustrator' | 'other';
export const ItemConferenceSubTypes: ItemSubTypes = [
- { type: "powerpoint", label: "PowerPoint" },
- { type: "pdf", label: "PDF" },
- { type: "illustrator", label: "Illustrator" },
- { type: "other", label: "Other" },
+ { type: 'powerpoint', label: 'PowerPoint' },
+ { type: 'pdf', label: 'PDF' },
+ { type: 'illustrator', label: 'Illustrator' },
+ { type: 'other', label: 'Other' },
];
export interface ItemConference extends ItemBasic {
presentation_type: ItemConferenceSubType;
@@ -102,13 +117,13 @@ export interface ItemConference extends ItemBasic {
author: string[];
}
-export type ItemDataSubType = "excel" | "movie" | "text" | "picture" | "other";
+export type ItemDataSubType = 'excel' | 'movie' | 'text' | 'picture' | 'other';
export const ItemDataSubTypes: ItemSubTypes = [
- { type: "excel", label: "Excel" },
- { type: "movie", label: "Movie" },
- { type: "text", label: "Text" },
- { type: "picture", label: "Picture" },
- { type: "other", label: "Other" },
+ { type: 'excel', label: 'Excel' },
+ { type: 'movie', label: 'Movie' },
+ { type: 'text', label: 'Text' },
+ { type: 'picture', label: 'Picture' },
+ { type: 'other', label: 'Other' },
];
export interface ItemData extends ItemBasic {
data_type: ItemDataSubType;
@@ -122,10 +137,10 @@ export interface ItemData extends ItemBasic {
experimenter: string[];
}
-export type ItemFilesSubType = "pdf" | "zip"; // Brain Atlas extended
+export type ItemFilesSubType = 'pdf' | 'zip'; // Brain Atlas extended
export const ItemFilesSubTypes: ItemSubTypes = [
- { type: "pdf", label: "pdf" },
- { type: "zip", label: "zip" },
+ { type: 'pdf', label: 'pdf' },
+ { type: 'zip', label: 'zip' },
];
export interface ItemFiles extends ItemBasic {
data_file_name: string;
@@ -137,15 +152,22 @@ export interface ItemMemo extends ItemBasic {
item_link: string;
}
-export type ItemModelSubType = "matlab" | "neuron" | "original_program" | "satellite" | "genesis" | "a_cell" | "other";
+export type ItemModelSubType =
+ | 'matlab'
+ | 'neuron'
+ | 'original_program'
+ | 'satellite'
+ | 'genesis'
+ | 'a_cell'
+ | 'other';
export const ItemModelSubTypes: ItemSubTypes = [
- { type: "matlab", label: "Matlab" },
- { type: "neuron", label: "Neuron" },
- { type: "original_program", label: "Original Program" },
- { type: "satellite", label: "Satellite" },
- { type: "genesis", label: "Genesis" },
- { type: "a_cell", label: "A-Cell" },
- { type: "other", label: "Other" },
+ { type: 'matlab', label: 'Matlab' },
+ { type: 'neuron', label: 'Neuron' },
+ { type: 'original_program', label: 'Original Program' },
+ { type: 'satellite', label: 'Satellite' },
+ { type: 'genesis', label: 'Genesis' },
+ { type: 'a_cell', label: 'A-Cell' },
+ { type: 'other', label: 'Other' },
];
export interface ItemModel extends ItemBasic {
model_type: ItemModelSubType;
@@ -169,14 +191,20 @@ export interface ItemPaper extends ItemBasic {
author: string[];
}
-export type ItemPresentationSubType = "powerpoint" | "lotus" | "justsystem" | "html" | "pdf" | "other";
+export type ItemPresentationSubType =
+ | 'powerpoint'
+ | 'lotus'
+ | 'justsystem'
+ | 'html'
+ | 'pdf'
+ | 'other';
export const ItemPresentationSubTypes: ItemSubTypes = [
- { type: "powerpoint", label: "PowerPoint" },
- { type: "lotus", label: "Lotus" },
- { type: "justsystem", label: "JustSystem" },
- { type: "html", label: "HTML" },
- { type: "pdf", label: "PDF" },
- { type: "other", label: "Other" },
+ { type: 'powerpoint', label: 'PowerPoint' },
+ { type: 'lotus', label: 'Lotus' },
+ { type: 'justsystem', label: 'JustSystem' },
+ { type: 'html', label: 'HTML' },
+ { type: 'pdf', label: 'PDF' },
+ { type: 'other', label: 'Other' },
];
export interface ItemPresentation extends ItemBasic {
presentation_type: ItemPresentationSubType;
@@ -190,12 +218,12 @@ export interface ItemPresentation extends ItemBasic {
creator: string[];
}
-export type ItemSimulatorSubType = "matlab" | "mathematica" | "program" | "other";
+export type ItemSimulatorSubType = 'matlab' | 'mathematica' | 'program' | 'other';
export const ItemSimulatorSubTypes: ItemSubTypes = [
- { type: "matlab", label: "Matlab" },
- { type: "mathematica", label: "Mathematica" },
- { type: "program", label: "Program" },
- { type: "other", label: "Other" },
+ { type: 'matlab', label: 'Matlab' },
+ { type: 'mathematica', label: 'Mathematica' },
+ { type: 'program', label: 'Program' },
+ { type: 'other', label: 'Other' },
];
export interface ItemSimulator extends ItemBasic {
simulator_type: ItemSimulatorSubType;
@@ -209,12 +237,12 @@ export interface ItemSimulator extends ItemBasic {
developer: string[];
}
-export type ItemStimulusSubType = "picture" | "movie" | "program" | "other";
+export type ItemStimulusSubType = 'picture' | 'movie' | 'program' | 'other';
export const ItemStimulusSubTypes: ItemSubTypes = [
- { type: "picture", label: "Picture" },
- { type: "movie", label: "Movie" },
- { type: "program", label: "Program" },
- { type: "other", label: "Other" },
+ { type: 'picture', label: 'Picture' },
+ { type: 'movie', label: 'Movie' },
+ { type: 'program', label: 'Program' },
+ { type: 'other', label: 'Other' },
];
export interface ItemStimulus extends ItemBasic {
stimulus_type: ItemStimulusSubType;
@@ -228,12 +256,12 @@ export interface ItemStimulus extends ItemBasic {
developer: string[];
}
-export type ItemToolSubType = "matlab" | "mathematica" | "program" | "other";
+export type ItemToolSubType = 'matlab' | 'mathematica' | 'program' | 'other';
export const ItemToolSubTypes: ItemSubTypes = [
- { type: "matlab", label: "Matlab" },
- { type: "mathematica", label: "Mathematica" },
- { type: "program", label: "Program" },
- { type: "other", label: "Other" },
+ { type: 'matlab', label: 'Matlab' },
+ { type: 'mathematica', label: 'Mathematica' },
+ { type: 'program', label: 'Program' },
+ { type: 'other', label: 'Other' },
];
export interface ItemTool extends ItemBasic {
tool_type: ItemToolSubType;
@@ -252,17 +280,76 @@ export interface ItemUrl extends ItemBasic {
url_count: number;
}
-export type Item = ItemBinder | ItemBook | ItemConference | ItemData | ItemFiles | ItemMemo | ItemModel | ItemPaper | ItemPresentation | ItemSimulator | ItemStimulus | ItemTool | ItemUrl;
+export type Item =
+ | ItemBinder
+ | ItemBook
+ | ItemConference
+ | ItemData
+ | ItemFiles
+ | ItemMemo
+ | ItemModel
+ | ItemPaper
+ | ItemPresentation
+ | ItemSimulator
+ | ItemStimulus
+ | ItemTool
+ | ItemUrl;
-export type KeywordSearchType = "all" | "basic" | "binder" | "book" | "conference" | "data" | "files" | "memo" | "model" | "paper" | "presentation" | "simulator" | "stimulus" | "tool" | "url";
+export type ItemSubTypesAll =
+ | ItemSubTypes
+ | ItemSubTypes
+ | ItemSubTypes // Brain Atlas extended
+ | ItemSubTypes
+ | ItemSubTypes
+ | ItemSubTypes
+ | ItemSubTypes
+ | ItemSubTypes;
+
+export type KeywordSearchType =
+ | 'all'
+ | 'basic'
+ | 'binder'
+ | 'book'
+ | 'conference'
+ | 'data'
+ | 'files'
+ | 'memo'
+ | 'model'
+ | 'paper'
+ | 'presentation'
+ | 'simulator'
+ | 'stimulus'
+ | 'tool'
+ | 'url';
export interface KeywordSearchQuery {
type: KeywordSearchType;
keyword: string;
}
-const KEYWORD_SEARCH_TYPE_RANGE = ["all", "basic", "binder", "book", "conference", "files", "data", "memo", "model", "paper", "presentation", "simulator", "stimulus", "tool", "url"];
+const KEYWORD_SEARCH_TYPE_RANGE = [
+ 'all',
+ 'basic',
+ 'binder',
+ 'book',
+ 'conference',
+ 'files',
+ 'data',
+ 'memo',
+ 'model',
+ 'paper',
+ 'presentation',
+ 'simulator',
+ 'stimulus',
+ 'tool',
+ 'url',
+];
export type SortConditionLimit = 20 | 50 | 100;
-export type SortConditionOrderBy = "title" | "doi" | "last_update_date" | "creation_date" | "publication_date";
+export type SortConditionOrderBy =
+ | 'title'
+ | 'doi'
+ | 'last_update_date'
+ | 'creation_date'
+ | 'publication_date';
export enum SortConditionOrderDir {
ASC,
DESC,
@@ -285,27 +372,27 @@ class ItemSorter {
this.sort = this.sort.bind(this);
}
- sort(a: Item, b: Item) {
- let av: string = "";
- let bv: string = "";
+ sort(a: Item, b: Item): number {
+ let av = '';
+ let bv = '';
switch (this.orderBy) {
- case "title":
+ case 'title':
av = a.title.toLocaleUpperCase();
bv = b.title.toLocaleUpperCase();
break;
- case "doi":
+ case 'doi':
av = a.doi.toLocaleUpperCase();
bv = b.doi.toLocaleUpperCase();
break;
- case "last_update_date":
+ case 'last_update_date':
av = String(a.last_update_date);
bv = String(b.last_update_date);
break;
- case "creation_date":
+ case 'creation_date':
av = String(a.creation_date);
bv = String(b.creation_date);
break;
- case "publication_date":
+ case 'publication_date':
av = String(a.publication_year * 10000 + a.publication_month * 100 + a.publication_mday);
bv = String(b.publication_year * 10000 + b.publication_month * 100 + b.publication_mday);
break;
@@ -324,23 +411,15 @@ class ItemSorter {
}
type GetResult = Item | null;
-export interface GetCallbackFunc {
- (item: GetResult): void;
-}
+export type GetCallbackFunc = (item: GetResult) => void;
export interface SearchResult {
total: number;
data: Item[];
}
-export interface SearchCallbackFunc {
- (results: SearchResult): void;
-}
-export interface SearchFunc {
- (condition: SortCondition, func: SearchCallbackFunc): void;
-}
+export type SearchCallbackFunc = (results: SearchResult) => void;
+export type SearchFunc = (condition: SortCondition, func: SearchCallbackFunc) => void;
-interface ItemLoadCallbackFunc {
- (items: Collection- ): void;
-}
+type ItemLoadCallbackFunc = (items: Collection
- ) => void;
class ItemUtil {
private database: loki;
@@ -350,9 +429,9 @@ class ItemUtil {
private callbacks: Map
;
constructor() {
- this.database = new loki("database");
+ this.database = new loki('database', { env: 'BROWSER' });
this.items = new Map>();
- this.simpfLinks = this.database.addCollection("simpf-links");
+ this.simpfLinks = this.database.addCollection('simpf-links');
this.loading = new Map();
this.callbacks = new Map();
this.load();
@@ -360,27 +439,38 @@ class ItemUtil {
load(): void {
BrainAtlasTypes.forEach((type) => {
- const collection = this.database.addCollection(type + "_items");
+ const collection = this.database.addCollection- (type + '_items');
this.items.set(type, collection);
this.loading.set(type, true);
this.callbacks.set(type, []);
- axios.get(process.env.PUBLIC_URL + "/" + type + "/items.json", { responseType: "json" }).then((response) => {
- const itemsJson = response.data as Item[];
- itemsJson.forEach((json: Item) => {
- collection.insert(json);
+ axios
+ .get
(`/data/${type}/items.json`, { responseType: 'json' })
+ .then((response) => {
+ const itemsJson = response.data;
+ itemsJson.forEach((json: Item) => {
+ collection.insert(json);
+ });
+ const lock = new AsyncLock();
+ lock.acquire(
+ `${type}_items`,
+ () => {
+ this.loading.set(type, false);
+ const callbacks = this.callbacks.get(type);
+ if (typeof callbacks !== 'undefined') {
+ callbacks.forEach((callback) => {
+ callback(collection);
+ });
+ this.callbacks.set(type, []);
+ }
+ },
+ () => {
+ // ignore
+ },
+ );
+ })
+ .catch(() => {
+ // ignore
});
- const lock = new AsyncLock();
- lock.acquire("items", () => {
- this.loading.set(type, false);
- const callbacks = this.callbacks.get(type);
- if (typeof callbacks !== "undefined") {
- callbacks.forEach((callback) => {
- callback(collection);
- });
- this.callbacks.set(type, []);
- }
- });
- });
});
const simpfLinks = simpfLinksJson as SimPFLink[];
simpfLinks.forEach((simpfLink: SimPFLink) => {
@@ -390,61 +480,78 @@ class ItemUtil {
registerItemLoadCallback(type: BrainAtlasType, func: ItemLoadCallbackFunc): void {
const lock = new AsyncLock();
- lock.acquire("items", () => {
- if (this.loading.get(type)) {
- const callbacks = this.callbacks.get(type);
- if (typeof callbacks !== "undefined") {
- callbacks.push(func);
+ lock.acquire(
+ `${type}_items`,
+ () => {
+ if (this.loading.get(type)) {
+ const callbacks = this.callbacks.get(type);
+ if (typeof callbacks !== 'undefined') {
+ callbacks.push(func);
+ }
+ } else {
+ const collection = this.items.get(type);
+ if (typeof collection !== 'undefined') {
+ func(collection);
+ }
}
- } else {
- const collection = this.items.get(type);
- if (typeof collection !== "undefined") {
- func(collection);
- }
- }
- });
+ },
+ () => {
+ // ignore
+ },
+ );
}
getUrl(type: BrainAtlasType, item: ItemCore): string {
const url = `/${type}/modules/xoonips/detail.php`;
- if (item.doi !== "") {
- return url + "?id=" + Functions.escape(item.doi);
+ if (item.doi !== '') {
+ return url + '?id=' + Functions.escape(item.doi);
}
- return url + "?item_id=" + String(item.item_id);
+ return url + '?item_id=' + String(item.item_id);
}
getFileUrl(type: BrainAtlasType, file: ItemBasicFile): string {
- return `${process.env.PUBLIC_URL}/${type}/file/` + String(file.file_id) + "/" + Functions.escape(file.original_file_name);
+ return `/data/${type}/file/${file.file_id}/${Functions.escape(file.original_file_name)}`;
}
getPreviewFileUrl(type: BrainAtlasType, file: ItemBasicFile): string {
- return `${process.env.PUBLIC_URL}/${type}/file/` + String(file.file_id) + ".png";
+ return `/data/${type}/file/${file.file_id}/.png`;
}
- getSearchByKeywordUrl(type: BrainAtlasType, kstype: KeywordSearchType, keyword: string): string {
- const params = new URLSearchParams({ keyword, search_itemtype: kstype });
- return `/${type}/modules/xoonips/itemselect.php?op=quicksearch&` + params.toString();
+ getSearchByKeywordUrl(type: BrainAtlasType, ksType: KeywordSearchType, keyword: string): string {
+ const params = new URLSearchParams({ keyword, search_itemtype: ksType });
+ return `/${type}/modules/xoonips/itemselect.php?op=quicksearch&${params.toString()}`;
}
getItemTypeSearchUrl(type: BrainAtlasType, itemType: string, subItemType: string): string {
const url = `/${type}/modules/xoonips/itemselect.php`;
- if (subItemType !== "") {
- return url + "?op=itemsubtypesearch&search_itemtype=xnp" + Functions.escape(itemType) + "&search_subitemtype=" + Functions.escape(subItemType);
+ if (subItemType !== '') {
+ return (
+ url +
+ '?op=itemsubtypesearch&search_itemtype=xnp' +
+ Functions.escape(itemType) +
+ '&search_subitemtype=' +
+ Functions.escape(subItemType)
+ );
}
- return url + "?op=itemtypesearch&search_itemtype=xnp" + Functions.escape(itemType);
+ return url + '?op=itemtypesearch&search_itemtype=xnp' + Functions.escape(itemType);
}
getSearchByAdvancedKeywordsUrl(type: BrainAtlasType, query: AdvancedSearchQuery): string {
const paramString = query.getQueryParams().toString();
- return `/${type}/modules/xoonips/itemselect.php?op=advanced` + (paramString.length > 0 ? "&" + paramString : "");
+ return (
+ `/${type}/modules/xoonips/itemselect.php?op=advanced` +
+ (paramString.length > 0 ? '&' + paramString : '')
+ );
}
getSearchKeywordByQuery(queryString: string): KeywordSearchQuery {
const query = new URLSearchParams(queryString);
- const qtype = query.get("search_itemtype");
- const type = qtype !== null && KEYWORD_SEARCH_TYPE_RANGE.includes(qtype) ? (qtype as KeywordSearchType) : "all";
- const qkeyword = query.get("keyword");
- const keyword = qkeyword === null ? "" : qkeyword;
+ const qType = query.get('search_itemtype');
+ const type =
+ qType !== null && KEYWORD_SEARCH_TYPE_RANGE.includes(qType)
+ ? (qType as KeywordSearchType)
+ : 'all';
+ const keyword = query.get('keyword') ?? '';
return { type, keyword };
}
@@ -456,7 +563,7 @@ class ItemUtil {
get(type: BrainAtlasType, itemId: number, func: GetCallbackFunc): void {
this.registerItemLoadCallback(type, (items) => {
- const filter = {
+ const filter: LokiSearchFilter = {
item_id: itemId,
};
const item = items.findOne(filter);
@@ -466,7 +573,7 @@ class ItemUtil {
getByDoi(type: BrainAtlasType, doi: string, func: GetCallbackFunc): void {
this.registerItemLoadCallback(type, (items) => {
- const filter = {
+ const filter: LokiSearchFilter = {
doi: doi,
};
const item = items.findOne(filter);
@@ -476,7 +583,7 @@ class ItemUtil {
getList(type: BrainAtlasType, itemIds: number[], func: SearchCallbackFunc): void {
this.registerItemLoadCallback(type, (items) => {
- const filter = {
+ const filter: LokiSearchFilter = {
item_id: {
$in: itemIds,
},
@@ -504,51 +611,66 @@ class ItemUtil {
});
}
- getListByIndexId(type: BrainAtlasType, indexId: number, condition: SortCondition, func: SearchCallbackFunc): void {
+ getListByIndexId(
+ type: BrainAtlasType,
+ indexId: number,
+ condition: SortCondition,
+ func: SearchCallbackFunc,
+ ): void {
this.registerItemLoadCallback(type, (items) => {
- const filter: any = {
- "index.index_id": indexId,
+ const filter: LokiSearchFilter = {
+ 'index.index_id': indexId,
};
const offset = condition.limit * (condition.page - 1);
const result = items.chain().find(filter);
const itemSorter = new ItemSorter(condition);
const ret = {
total: result.count(),
- data: result.sort(itemSorter.sort).offset(offset).limit(condition.limit).data(),
+ data: result
+ .sort((a, b) => itemSorter.sort(a, b))
+ .offset(offset)
+ .limit(condition.limit)
+ .data(),
};
func(ret);
});
}
- getListByItemType(type: BrainAtlasType, itemType: string, subItemType: string, condition: SortCondition, func: SearchCallbackFunc): void {
+ getListByItemType(
+ type: BrainAtlasType,
+ itemType: string,
+ subItemType: string,
+ condition: SortCondition,
+ func: SearchCallbackFunc,
+ ): void {
this.registerItemLoadCallback(type, (items) => {
- let filter: any = {
- item_type_name: "xnp" + itemType,
+ const filter: LokiSearchFilter = {
+ item_type_name: 'xnp' + itemType,
};
- if (subItemType !== "") {
+ if (subItemType !== '') {
switch (itemType) {
- case "conference":
+ case 'conference':
filter.presentation_type = subItemType;
break;
- case "data":
+ case 'data':
filter.data_type = subItemType;
break;
- case "files":
+ case 'files':
filter.data_file_filetype = subItemType;
break;
- case "model":
+ case 'model':
filter.model_type = subItemType;
break;
- case "presentation":
+ case 'presentation':
filter.presentation_type = subItemType;
break;
- case "simulator":
+ case 'simulator':
filter.simulator_type = subItemType;
break;
- case "stimulus":
+ case 'stimulus':
filter.stimulus_type = subItemType;
break;
- case "tool":
+ case 'tool':
filter.tool_type = subItemType;
break;
default:
@@ -560,133 +682,283 @@ class ItemUtil {
const itemSorter = new ItemSorter(condition);
const ret = {
total: result.count(),
- data: result.sort(itemSorter.sort).offset(offset).limit(condition.limit).data(),
+ data: result
+ .sort((a, b) => itemSorter.sort(a, b))
+ .offset(offset)
+ .limit(condition.limit)
+ .data(),
};
func(ret);
});
}
- getListByKeyword(type: BrainAtlasType, kstype: KeywordSearchType, keyword: string, condition: SortCondition, func: SearchCallbackFunc): void {
+ getListByKeyword(
+ type: BrainAtlasType,
+ ksType: KeywordSearchType,
+ keyword: string,
+ condition: SortCondition,
+ func: SearchCallbackFunc,
+ ): void {
this.registerItemLoadCallback(type, (items) => {
- const regex = keyword.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+ const regex = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
const num = keyword.match(/^[0-9]+$/) ? parseInt(keyword, 10) : null;
- let filter: any = { $or: [] };
+ const filter: LokiSearchFilter = {};
+ const filterOr: LokiSearchFilter[] = [];
const appendToFilter = (type: string, strKeys: string[], numKeys: string[]) => {
- const basicStrKeys: string[] = ["title", "keyword", "doi", "description", "uname", "name", "index.title"];
+ const basicStrKeys: string[] = [
+ 'title',
+ 'keyword',
+ 'doi',
+ 'description',
+ 'uname',
+ 'name',
+ 'index.title',
+ ];
const basicNumKeys: string[] = [];
- let filterItemType: any = {
- item_type_name: "xnp" + type,
- $or: [],
- };
- let sKeys: string[] = basicStrKeys.concat(strKeys);
- let nKeys: string[] = basicNumKeys.concat(numKeys);
+ const filterItemTypeOr: LokiSearchFilter[] = [];
+ const sKeys: string[] = basicStrKeys.concat(strKeys);
+ const nKeys: string[] = basicNumKeys.concat(numKeys);
sKeys.forEach((key) => {
- let criteria: any = {};
- criteria[key] = { $regex: [regex, "i"] };
- filterItemType["$or"].push(criteria);
+ const criteria: LokiSearchFilter = {};
+ criteria[key] = { $regex: [regex, 'i'] };
+ filterItemTypeOr.push(criteria);
});
if (num !== null) {
nKeys.forEach((key) => {
- let criteria: any = {};
+ const criteria: LokiSearchFilter = {};
criteria[key] = { $eq: num };
- filterItemType["$or"].push(criteria);
+ filterItemTypeOr.push(criteria);
});
}
- filter["$or"].push(filterItemType);
+ filterOr.push({
+ item_type_name: 'xnp' + type,
+ $or: filterItemTypeOr,
+ });
};
- if (kstype === "basic") {
- filter["$or"].push({ title: { $regex: [regex, "i"] } });
- filter["$or"].push({ keyword: { $regex: [regex, "i"] } });
+ if (ksType === 'basic') {
+ filterOr.push({ title: { $regex: [regex, 'i'] } });
+ filterOr.push({ keyword: { $regex: [regex, 'i'] } });
} else {
- if (kstype === "all" || kstype === "binder") {
- const strKeys: string[] = ["doi", "title", "keyword", "description"];
+ if (ksType === 'all' || ksType === 'binder') {
+ const strKeys: string[] = ['doi', 'title', 'keyword', 'description'];
const numKeys: string[] = [];
- appendToFilter("binder", strKeys, numKeys);
+ appendToFilter('binder', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "book") {
- const strKeys: string[] = ["doi", "title", "keyword", "classification", "editor", "publisher", "isbn", "url", "author", "file.caption", "file.original_file_name"];
+ if (ksType === 'all' || ksType === 'book') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'classification',
+ 'editor',
+ 'publisher',
+ 'isbn',
+ 'url',
+ 'author',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
const numKeys: string[] = [];
- appendToFilter("book", strKeys, numKeys);
+ appendToFilter('book', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "conference") {
- const strKeys: string[] = ["doi", "title", "conference_title", "place", "abstract", "author", "file.caption", "file.original_file_name"];
- const numKeys: string[] = ["conference_from_year", "conference_from_month", "conference_from_mday", "conference_to_year", "conference_to_month", "conference_to_mday"];
- appendToFilter("conference", strKeys, numKeys);
+ if (ksType === 'all' || ksType === 'conference') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'conference_title',
+ 'place',
+ 'abstract',
+ 'author',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
+ const numKeys: string[] = [
+ 'conference_from_year',
+ 'conference_from_month',
+ 'conference_from_mday',
+ 'conference_to_year',
+ 'conference_to_month',
+ 'conference_to_mday',
+ ];
+ appendToFilter('conference', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "data") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "readme", "rights", "experimenter", "data_type", "file.caption", "file.original_file_name"];
- const numKeys: string[] = ["publication_year", "publication_month", "publication_mday"];
- appendToFilter("data", strKeys, numKeys);
+ if (ksType === 'all' || ksType === 'data') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'readme',
+ 'rights',
+ 'experimenter',
+ 'data_type',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
+ const numKeys: string[] = ['publication_year', 'publication_month', 'publication_mday'];
+ appendToFilter('data', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "files") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "data_file_name", "data_file_mimetype", "data_file_filetype"];
+ if (ksType === 'all' || ksType === 'files') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'data_file_name',
+ 'data_file_mimetype',
+ 'data_file_filetype',
+ ];
const numKeys: string[] = [];
- appendToFilter("files", strKeys, numKeys);
+ appendToFilter('files', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "memo") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "item_link", "file.original_file_name"];
+ if (ksType === 'all' || ksType === 'memo') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'item_link',
+ 'file.original_file_name',
+ ];
const numKeys: string[] = [];
- appendToFilter("memo", strKeys, numKeys);
+ appendToFilter('memo', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "model") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "readme", "rights", "creator", "model_type", "file.caption", "file.original_file_name"];
+ if (ksType === 'all' || ksType === 'model') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'readme',
+ 'rights',
+ 'creator',
+ 'model_type',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
const numKeys: string[] = [];
- appendToFilter("model", strKeys, numKeys);
+ appendToFilter('model', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "paper") {
- const strKeys: string[] = ["doi", "title", "keyword", "journal", "page", "pubmed_id", "author"];
- const numKeys: string[] = ["publication_year", "volume", "number"];
- appendToFilter("paper", strKeys, numKeys);
+ if (ksType === 'all' || ksType === 'paper') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'journal',
+ 'page',
+ 'pubmed_id',
+ 'author',
+ ];
+ const numKeys: string[] = ['publication_year', 'volume', 'number'];
+ appendToFilter('paper', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "presentation") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "readme", "rights", "creator", "presentation_type", "file.caption", "file.original_file_name"];
- const numKeys: string[] = ["publication_year", "publication_month", "publication_mday"];
- appendToFilter("presentation", strKeys, numKeys);
+ if (ksType === 'all' || ksType === 'presentation') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'readme',
+ 'rights',
+ 'creator',
+ 'presentation_type',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
+ const numKeys: string[] = ['publication_year', 'publication_month', 'publication_mday'];
+ appendToFilter('presentation', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "simulator") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "readme", "rights", "developer", "simulator_type", "file.caption", "file.original_file_name"];
- const numKeys: string[] = ["publication_year", "publication_month", "publication_mday"];
- appendToFilter("simulator", strKeys, numKeys);
+ if (ksType === 'all' || ksType === 'simulator') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'readme',
+ 'rights',
+ 'developer',
+ 'simulator_type',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
+ const numKeys: string[] = ['publication_year', 'publication_month', 'publication_mday'];
+ appendToFilter('simulator', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "stimulus") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "readme", "rights", "developer", "stimulus_type", "file.caption", "file.original_file_name"];
- const numKeys: string[] = ["publication_year", "publication_month", "publication_mday"];
- appendToFilter("stimulus", strKeys, numKeys);
+ if (ksType === 'all' || ksType === 'stimulus') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'readme',
+ 'rights',
+ 'developer',
+ 'stimulus_type',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
+ const numKeys: string[] = ['publication_year', 'publication_month', 'publication_mday'];
+ appendToFilter('stimulus', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "tool") {
- const strKeys: string[] = ["doi", "title", "keyword", "description", "readme", "rights", "developer", "tool_type", "file.caption", "file.original_file_name"];
+ if (ksType === 'all' || ksType === 'tool') {
+ const strKeys: string[] = [
+ 'doi',
+ 'title',
+ 'keyword',
+ 'description',
+ 'readme',
+ 'rights',
+ 'developer',
+ 'tool_type',
+ 'file.caption',
+ 'file.original_file_name',
+ ];
const numKeys: string[] = [];
- appendToFilter("tool", strKeys, numKeys);
+ appendToFilter('tool', strKeys, numKeys);
}
- if (kstype === "all" || kstype === "url") {
- const strKeys: string[] = ["doi", "title", "keyword", "url", "file.original_file_name"];
+ if (ksType === 'all' || ksType === 'url') {
+ const strKeys: string[] = ['doi', 'title', 'keyword', 'url', 'file.original_file_name'];
const numKeys: string[] = [];
- appendToFilter("url", strKeys, numKeys);
+ appendToFilter('url', strKeys, numKeys);
}
- if (kstype !== "all") {
- filter["item_type_name"] = "xnp" + kstype;
+ if (ksType !== 'all') {
+ filter.item_type_name = 'xnp' + ksType;
}
}
+ filter.$or = filterOr;
const offset = condition.limit * (condition.page - 1);
const result = items.chain().find(filter);
const itemSorter = new ItemSorter(condition);
const ret = {
total: result.count(),
- data: result.sort(itemSorter.sort).offset(offset).limit(condition.limit).data(),
+ data: result
+ .sort((a, b) => itemSorter.sort(a, b))
+ .offset(offset)
+ .limit(condition.limit)
+ .data(),
};
func(ret);
});
}
- getListByAdvancedSearchQuery(type: BrainAtlasType, query: AdvancedSearchQuery, condition: SortCondition, func: SearchCallbackFunc): void {
+ getListByAdvancedSearchQuery(
+ type: BrainAtlasType,
+ query: AdvancedSearchQuery,
+ condition: SortCondition,
+ func: SearchCallbackFunc,
+ ): void {
this.registerItemLoadCallback(type, (items) => {
- const filter: any = query.getSearchFilter();
+ const filter: LokiSearchFilter = query.getSearchFilter();
const offset = condition.limit * (condition.page - 1);
const result = items.chain().find(filter);
const itemSorter = new ItemSorter(condition);
const ret = {
total: result.count(),
- data: result.sort(itemSorter.sort).offset(offset).limit(condition.limit).data(),
+ data: result
+ .sort((a, b) => itemSorter.sort(a, b))
+ .offset(offset)
+ .limit(condition.limit)
+ .data(),
};
func(ret);
});
@@ -695,7 +967,7 @@ class ItemUtil {
getSimPFLinkUrl(itemId: number) {
const simpfLink = this.simpfLinks.findOne({ id: itemId });
if (simpfLink === null) {
- return "";
+ return '';
}
return simpfLink.url;
}
diff --git a/src/database/lib/types.ts b/src/database/lib/types.ts
new file mode 100644
index 0000000..bbc2f4c
--- /dev/null
+++ b/src/database/lib/types.ts
@@ -0,0 +1,3 @@
+export interface LokiSearchFilter {
+ [key: string]: string | string[] | number | number[] | LokiSearchFilter | LokiSearchFilter[];
+}
diff --git a/src/functions.ts b/src/functions.ts
index 150fce4..cd63f2a 100644
--- a/src/functions.ts
+++ b/src/functions.ts
@@ -1,9 +1,9 @@
-import XRegExp from "xregexp";
-import Config, { MultiLang } from "./config";
+import XRegExp from 'xregexp';
+import Config, { MultiLang } from './config';
const escape = (str: string) => {
return encodeURIComponent(str).replace(/[!'()*]/g, (c) => {
- return "%" + c.charCodeAt(0).toString(16);
+ return '%' + c.charCodeAt(0).toString(16);
});
};
@@ -14,36 +14,36 @@ const unescape = (str: string) => {
const htmlspecialchars = (str: string) => {
return str.replace(/(<|>|&|'|")/g, (match) => {
switch (match) {
- case "<":
- return "<";
- case ">":
- return ">";
- case "&":
- return "&";
+ case '<':
+ return '<';
+ case '>':
+ return '>';
+ case '&':
+ return '&';
case "'":
- return "'";
+ return ''';
case '"':
- return """;
+ return '"';
}
- return "";
+ return '';
});
};
const camelCase = (str: string) => {
return str.replace(/[-_](.)/g, (...matches) => {
- return matches[1].toUpperCase();
+ return (matches[1] as string).toUpperCase();
});
};
const snakeCase = (str: string) => {
- var camel = camelCase(str);
+ const camel = camelCase(str);
return camel.replace(/[A-Z]/g, (...matches) => {
- return "_" + matches[0].charAt(0).toLowerCase();
+ return '_' + matches[0].charAt(0).toLowerCase();
});
};
const pascalCase = (str: string) => {
- var camel = camelCase(str);
+ const camel = camelCase(str);
return camel.charAt(0).toUpperCase() + camel.slice(1);
};
@@ -58,49 +58,68 @@ const base64Decode = (str: string) => {
const ordinal = (num: number) => {
const hundred = num % 100;
if (hundred >= 10 && hundred <= 20) {
- return "th";
+ return 'th';
}
const ten = num % 10;
- const suffix = ["st", "nd", "rd"];
- return ten > 0 && ten < 4 ? suffix[ten - 1] : "th";
+ const suffix = ['st', 'nd', 'rd'];
+ return ten > 0 && ten < 4 ? suffix[ten - 1] : 'th';
};
const mlang = (str: string, lang: MultiLang) => {
- const mlLangs = ["en", "ja"];
+ const mlLangs = ['en', 'ja'];
// escape brackets inside of
- let text = str.replace(/(]*)(>)/gis, (whole, m1, m2, m3) => {
- if (m2.match(/type=["']?(?:text|hidden)["']?/is)) {
- return m1 + m2.replace(/\[/g, "__ml[ml__") + m3;
- }
- return whole;
- });
+ let text = str.replace(
+ /(]*)(>)/gis,
+ (whole: string, m1: string, m2: string, m3: string) => {
+ if (m2.match(/type=["']?(?:text|hidden)["']?/is)) {
+ return m1 + m2.replace(/\[/g, '__ml[ml__') + m3;
+ }
+ return whole;
+ },
+ );
// escape brackets inside of
- text = text.replace(/(]*>)(.*)(<\/textarea>)/gis, (whole, m1, m2, m3) => {
- return m1 + m2.replace(/\[/g, "__ml[ml__") + m3;
- });
+ text = text.replace(
+ /(]*>)(.*)(<\/textarea>)/gis,
+ (_, m1: string, m2: string, m3: string) => {
+ return m1 + m2.replace(/\[/g, '__ml[ml__') + m3;
+ },
+ );
// simple pattern to strip selected lang_tags
- const re = new RegExp("\\[/?(?:[^\\]]+\\|)?" + lang + "(?:\\|[^\\]]+)?\\](?:
)?", "g"); - text = text.replace(re, ""); + const re = new RegExp('\\[/?(?:[^\\]]+\\|)?' + lang + '(?:\\|[^\\]]+)?\\](?:
)?', 'g'); + text = text.replace(re, ''); // eliminate description between the other language tags. mlLangs.forEach((mlLang) => { if (mlLang !== lang) { - const re = XRegExp("\\[(?:[^/][^\\]]+\\|)?" + mlLang + "(?:\\|[^\\]]+)?\\].*?\\[/(?:[^\\]]+\\|)?" + mlLang + "(?:\\|[^\\]]+)?\\](?:
)?", "isg"); + const re = XRegExp( + '\\[(?:[^/][^\\]]+\\|)?' + + mlLang + + '(?:\\|[^\\]]+)?\\].*?\\[/(?:[^\\]]+\\|)?' + + mlLang + + '(?:\\|[^\\]]+)?\\](?:
)?', + 'isg', + ); text = text.replace(re, (whole) => { - return whole.match(/<\/table>/) ? whole : ""; + return whole.match(/<\/table>/) ? whole : ''; }); } }); // unescape brackets inside of - text = text.replace(/(]*>)(.*)(<\/textarea>)/gis, (whole, m1, m2, m3) => {
- return m1 + m2.replace(/__ml\[ml__/g, "[") + m3;
- });
+ text = text.replace(
+ /(]*>)(.*)(<\/textarea>)/gis,
+ (_, m1: string, m2: string, m3: string) => {
+ return m1 + m2.replace(/__ml\[ml__/g, '[') + m3;
+ },
+ );
// unescape brackets inside of
- text = text.replace(/(]*)(>)/gis, (whole, m1, m2, m3) => {
- if (m2.match(/type=["']?(?:text|hidden)["']?/is)) {
- return m1 + m2.replace(/__ml\[ml__/g, "[") + m3;
- }
- return whole;
- });
+ text = text.replace(
+ /(]*)(>)/gis,
+ (whole: string, m1: string, m2: string, m3: string) => {
+ if (m2.match(/type=["']?(?:text|hidden)["']?/is)) {
+ return m1 + m2.replace(/__ml\[ml__/g, '[') + m3;
+ }
+ return whole;
+ },
+ );
return text;
};
diff --git a/src/index.css b/src/index.css
index 2daa7e9..e69de29 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1 +0,0 @@
-@import-normalize;
diff --git a/src/index.tsx b/src/index.tsx
index e2b9cf7..c1ef668 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,19 +1,15 @@
-import React from "react";
-import "react-app-polyfill/ie11";
-import "react-app-polyfill/stable";
-import ReactDOM from "react-dom/client";
-import App from "./App";
-import "./index.css";
-import reportWebVitals from "./reportWebVitals";
+import React from 'react';
-const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement);
-root.render(
+import ReactDOM from 'react-dom/client';
+import App from './App';
+
+import 'sanitize.css';
+import 'sanitize.css/forms.css';
+import 'sanitize.css/typography.css';
+import './index.css';
+
+ReactDOM.createRoot(document.getElementById('root')!).render(
+ ,
);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5..0000000
--- a/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-///
{Functions.mlang("[en]Search Items[/en][ja]アイテム検索[/ja]", lang)}
-
-
-
- {Config.XOONIPS_ITEMTYPES.map((type) => {
- return
-
-
+ return (
+
+ = (props: PropsFC) => {
- const { lang, type } = props;
- return
+ );
};
-export default DatabaseAdvancedSearchFC;
+export default DatabaseAdvancedSearch;
diff --git a/src/database/DatabaseDetailItem.tsx b/src/database/DatabaseDetailItem.tsx
index 19ca508..13e1de2 100644
--- a/src/database/DatabaseDetailItem.tsx
+++ b/src/database/DatabaseDetailItem.tsx
@@ -1,11 +1,12 @@
-import React from "react";
-import { Helmet } from "react-helmet-async";
-import Loading from "../common/lib/Loading";
-import PageNotFound from "../common/lib/PageNotFound";
-import { BrainAtlasType, MultiLang } from "../config";
-import Functions from "../functions";
-import ItemType from "./item-type";
-import ItemUtil, { Item } from "./lib/ItemUtil";
+import React from 'react';
+
+import { Helmet } from 'react-helmet-async';
+import Loading from '../common/lib/Loading';
+import PageNotFound from '../common/lib/PageNotFound';
+import { BrainAtlasType, MultiLang } from '../config';
+import Functions from '../functions';
+import ItemType from './item-type';
+import ItemUtil, { Item } from './lib/ItemUtil';
interface Props {
lang: MultiLang;
@@ -14,65 +15,49 @@ interface Props {
doi: string;
}
-interface State {
- loading: boolean;
- item: Item | null;
-}
+const DatabaseDetailItem: React.FC{Functions.mlang('[en]Search Items[/en][ja]アイテム検索[/ja]', lang)}
+
+
- );
- }
-}
-
-const DatabaseAdvancedSearchFC: React.FC
+
+
+ {Functions.mlang("[en]Detail[/en][ja]詳細[/ja]", lang)}
--
{Functions.mlang('[en]Detail[/en][ja]詳細[/ja]', lang)}
++
-
- );
- }
-}
-
-const DatabaseSearchByAdvancedKeywordFC: React.FCListing item
-
+
+ );
};
-export default DatabaseSearchByAdvancedKeywordFC;
+export default DatabaseSearchByAdvancedKeyword;
diff --git a/src/database/DatabaseSearchByIndexId.tsx b/src/database/DatabaseSearchByIndexId.tsx
index 6fcf323..7b674da 100644
--- a/src/database/DatabaseSearchByIndexId.tsx
+++ b/src/database/DatabaseSearchByIndexId.tsx
@@ -1,80 +1,92 @@
-import React, { Fragment } from "react";
-import { Helmet } from "react-helmet-async";
-import { Link } from "react-router-dom";
-import PageNotFound from "../common/lib/PageNotFound";
-import { BrainAtlasType, MultiLang } from "../config";
-import Functions from "../functions";
-import DatabaseListIndex from "./lib/DatabaseListIndex";
-import DatabaseListItem from "./lib/DatabaseListItem";
-import IndexUtil, { Index } from "./lib/IndexUtil";
-import ItemUtil, { SearchCallbackFunc, SortCondition } from "./lib/ItemUtil";
+import React from 'react';
-export interface Props {
+import { Helmet } from 'react-helmet-async';
+import { Link } from 'react-router-dom';
+import Loading from '../common/lib/Loading';
+import PageNotFound from '../common/lib/PageNotFound';
+import { BrainAtlasType, MultiLang } from '../config';
+import Functions from '../functions';
+import DatabaseListIndex from './lib/DatabaseListIndex';
+import DatabaseListItem from './lib/DatabaseListItem';
+import IndexUtil, { Index } from './lib/IndexUtil';
+import ItemUtil, { SearchCallbackFunc, SortCondition } from './lib/ItemUtil';
+
+interface Props {
lang: MultiLang;
type: BrainAtlasType;
indexId: number;
}
-class DatabaseSearchByIndexId extends React.ComponentListing item
+
-
-
- {Functions.mlang(title, lang)} - {Functions.mlang("[en]Database[/en][ja]データベース[/ja]", lang)} - {Functions.siteTitle(lang)}
-
-
-
- );
+ if (index == null) {
+ return {Functions.mlang("[en]Listing item[/en][ja]アイテム一覧[/ja]", lang)}
-{parents}
-
+
+
+ {Functions.mlang(parents.title, lang)} -{' '}
+ {Functions.mlang('[en]Database[/en][ja]データベース[/ja]', lang)} -{' '}
+ {Functions.siteTitle(lang)}
+
+
+
+ );
+};
export default DatabaseSearchByIndexId;
diff --git a/src/database/DatabaseSearchByItemType.tsx b/src/database/DatabaseSearchByItemType.tsx
index 2b5f6da..790d369 100644
--- a/src/database/DatabaseSearchByItemType.tsx
+++ b/src/database/DatabaseSearchByItemType.tsx
@@ -1,8 +1,9 @@
-import React from "react";
-import { BrainAtlasType, MultiLang } from "../config";
-import Functions from "../functions";
-import DatabaseListItem from "./lib/DatabaseListItem";
-import ItemUtil, { SearchCallbackFunc, SortCondition } from "./lib/ItemUtil";
+import React from 'react';
+
+import { BrainAtlasType, MultiLang } from '../config';
+import Functions from '../functions';
+import DatabaseListItem from './lib/DatabaseListItem';
+import ItemUtil, { SearchCallbackFunc, SortCondition } from './lib/ItemUtil';
interface Props {
lang: MultiLang;
@@ -11,38 +12,26 @@ interface Props {
type: BrainAtlasType;
}
-class DatabaseSearchByItemType extends React.Component{Functions.mlang('[en]Listing item[/en][ja]アイテム一覧[/ja]', lang)}
+{parents.node}
+
-
- );
- }
-}
+ return (
+ {Functions.mlang("[en]Listing item[/en][ja]アイテム一覧[/ja]", lang)}
-
+
+ );
+};
export default DatabaseSearchByItemType;
diff --git a/src/database/DatabaseSearchByKeyword.tsx b/src/database/DatabaseSearchByKeyword.tsx
index fac1490..31ea9f2 100644
--- a/src/database/DatabaseSearchByKeyword.tsx
+++ b/src/database/DatabaseSearchByKeyword.tsx
@@ -1,74 +1,41 @@
-import React from "react";
-import { useLocation } from "react-router-dom";
-import { BrainAtlasType, MultiLang } from "../config";
-import Functions from "../functions";
-import DatabaseListItem from "./lib/DatabaseListItem";
-import ItemUtil, { KeywordSearchType, SearchCallbackFunc, SortCondition } from "./lib/ItemUtil";
+import React from 'react';
-interface PropsFC {
+import { useLocation } from 'react-router-dom';
+import { BrainAtlasType, MultiLang } from '../config';
+import Functions from '../functions';
+import DatabaseListItem from './lib/DatabaseListItem';
+import ItemUtil, { SearchCallbackFunc, SortCondition } from './lib/ItemUtil';
+
+interface Props {
lang: MultiLang;
type: BrainAtlasType;
}
-interface Props extends PropsFC {
- location: any;
-}
+const DatabaseSearchByKeyword: React.FC{Functions.mlang('[en]Listing item[/en][ja]アイテム一覧[/ja]', lang)}
+
-
- );
- }
-}
-
-const DatabaseSearchByKeywordFC: React.FC{Functions.mlang("[en]Listing item[/en][ja]アイテム一覧[/ja]", lang)}
-- {Functions.mlang("[en]Search Keyword[/en][ja]検索キーワード[/ja]", lang)} : {this.state.keyword} -
-
+
+ );
};
-export default DatabaseSearchByKeywordFC;
+export default DatabaseSearchByKeyword;
diff --git a/src/database/DatabaseTop.tsx b/src/database/DatabaseTop.tsx
index 60dd78d..f96fbd1 100644
--- a/src/database/DatabaseTop.tsx
+++ b/src/database/DatabaseTop.tsx
@@ -1,14 +1,15 @@
-import React from "react";
-import Config, { BrainAtlasType, MultiLang } from "../config";
-import styles from "./DatabaseTop.module.css";
-import ItemType from "./item-type";
+import React from 'react';
+
+import Config, { BrainAtlasType, MultiLang } from '../config';
+import styles from './DatabaseTop.module.css';
+import ItemType from './item-type';
interface Props {
lang: MultiLang;
type: BrainAtlasType;
}
-const DatabaseTop: React.FC{Functions.mlang('[en]Listing item[/en][ja]アイテム一覧[/ja]', lang)}
++ {Functions.mlang('[en]Search Keyword[/en][ja]検索キーワード[/ja]', lang)} : {query.keyword} +
+
-
-
-
- );
- }
-}
+ return (
+
+
+
+
+ );
+};
export default IndexTree;
diff --git a/src/database/item-type/binder/BinderAdvancedSearch.tsx b/src/database/item-type/binder/BinderAdvancedSearch.tsx
index 615a3e1..44bdd2b 100644
--- a/src/database/item-type/binder/BinderAdvancedSearch.tsx
+++ b/src/database/item-type/binder/BinderAdvancedSearch.tsx
@@ -1,22 +1,28 @@
-import AdvancedSearchBase, { AdvancedSearchBaseProps } from "../lib/AdvancedSearchBase";
+import AdvancedSearchBase, { AdvancedSearchBaseProps } from '../lib/AdvancedSearchBase';
class BinderAdvancedSearch extends AdvancedSearchBase {
constructor(props: AdvancedSearchBaseProps) {
super(props);
- this.type = "binder";
- this.title = "Binder";
- this.state.values["title"] = "";
- this.state.values["keyword"] = "";
- this.state.values["description"] = "";
- this.state.values["doi"] = "";
+ this.type = 'binder';
+ this.title = 'Binder';
+ this.state.values.title = '';
+ this.state.values.keyword = '';
+ this.state.values.description = '';
+ this.state.values.doi = '';
}
getRows() {
const rows = [
- { label: "[en]Title[/en][ja]タイトル[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Free Keywords[/en][ja]フリーキーワード[/ja]", value: this.renderFieldInputText("keyword", 50) },
- { label: "[en]Description[/en][ja]概要[/ja]", value: this.renderFieldInputText("description", 50) },
- { label: "ID", value: this.renderFieldInputText("doi", 50) },
+ { label: '[en]Title[/en][ja]タイトル[/ja]', value: this.renderFieldInputText('title', 50) },
+ {
+ label: '[en]Free Keywords[/en][ja]フリーキーワード[/ja]',
+ value: this.renderFieldInputText('keyword', 50),
+ },
+ {
+ label: '[en]Description[/en][ja]概要[/ja]',
+ value: this.renderFieldInputText('description', 50),
+ },
+ { label: 'ID', value: this.renderFieldInputText('doi', 50) },
];
return rows;
}
diff --git a/src/database/item-type/binder/BinderDetail.tsx b/src/database/item-type/binder/BinderDetail.tsx
index 056ae14..cfc7f35 100644
--- a/src/database/item-type/binder/BinderDetail.tsx
+++ b/src/database/item-type/binder/BinderDetail.tsx
@@ -1,10 +1,11 @@
-import React from "react";
-import ItemType from "..";
-import { BrainAtlasType, MultiLang } from "../../../config";
-import Functions from "../../../functions";
-import ItemUtil, { Item, ItemBinder } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
+import React from 'react';
+
+import ItemType from '..';
+import { BrainAtlasType, MultiLang } from '../../../config';
+import Functions from '../../../functions';
+import ItemUtil, { Item, ItemBinder } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
interface Props {
lang: MultiLang;
@@ -12,75 +13,81 @@ interface Props {
type: BrainAtlasType;
}
-interface State {
- items: Item[];
-}
+const BinderLinkItems: React.FC|
- |
-
|
+ |
+
{this.renderFieldDate("From", "conference_from_year", "conference_from_month", "conference_from_mday")}
- {this.renderFieldDate("To", "conference_to_year", "conference_to_month", "conference_to_mday")}
+
+ {this.renderFieldDate(
+ 'From',
+ 'conference_from_year',
+ 'conference_from_month',
+ 'conference_from_mday',
+ )}
+
+
+ {this.renderFieldDate(
+ 'To',
+ 'conference_to_year',
+ 'conference_to_month',
+ 'conference_to_mday',
+ )}
+
);
}
getRows() {
const rows = [
- { label: "[en]Presentation Title[/en][ja]発表議題[/ja]", value: this.renderFieldInputText("title", 50) },
- { label: "[en]Presentation Type[/en][ja]発表資料ファイル形式[/ja]", value: this.renderFieldSelect("presentation_type", ItemConferenceSubTypes) },
- { label: "[en]Author[/en][ja]発表者[/ja]", value: this.renderFieldInputText("author", 50) },
- { label: "[en]Date[/en][ja]日付[/ja]", value: this.renderDate() },
+ {
+ label: '[en]Presentation Title[/en][ja]発表議題[/ja]',
+ value: this.renderFieldInputText('title', 50),
+ },
+ {
+ label: '[en]Presentation Type[/en][ja]発表資料ファイル形式[/ja]',
+ value: this.renderFieldSelect('presentation_type', ItemConferenceSubTypes),
+ },
+ { label: '[en]Author[/en][ja]発表者[/ja]', value: this.renderFieldInputText('author', 50) },
+ { label: '[en]Date[/en][ja]日付[/ja]', value: this.renderDate() },
];
return rows;
}
diff --git a/src/database/item-type/conference/ConferenceDetail.tsx b/src/database/item-type/conference/ConferenceDetail.tsx
index 6b7a6b5..9bdd3e1 100644
--- a/src/database/item-type/conference/ConferenceDetail.tsx
+++ b/src/database/item-type/conference/ConferenceDetail.tsx
@@ -1,33 +1,91 @@
-import React from "react";
-import Functions from "../../../functions";
-import { ItemConference } from "../../lib/ItemUtil";
-import DetailBase from "../lib/DetailBase";
-import ItemTypeField from "../lib/field";
-import ConferenceUtil from "./ConferenceUtil";
+import Functions from '../../../functions';
+import { ItemConference } from '../../lib/ItemUtil';
+import DetailBase from '../lib/DetailBase';
+import ItemTypeField from '../lib/field';
+import ConferenceUtil from './ConferenceUtil';
class ConferenceDetail extends DetailBase {
getFields() {
const { lang, type } = this.props;
const item = this.props.item as ItemConference;
return [
- { label: "ID", value: item.doi },
- { label: "[en]Language[/en][ja]言語[/ja]", value: - {Functions.mlang(item.conference_title, lang)} (
+ {Functions.mlang(item.conference_title, lang)} ( +
{authors} ); diff --git a/src/database/item-type/conference/ConferenceTop.tsx b/src/database/item-type/conference/ConferenceTop.tsx index df7fb7a..aeef252 100644 --- a/src/database/item-type/conference/ConferenceTop.tsx +++ b/src/database/item-type/conference/ConferenceTop.tsx @@ -1,14 +1,14 @@ -import iconFile from "../../assets/images/icon_conference.gif"; -import { ItemConferenceSubTypes } from "../../lib/ItemUtil"; -import TopBase, { TopBaseProps } from "../lib/TopBase"; +import iconFile from '../../assets/images/icon_conference.gif'; +import { ItemConferenceSubTypes } from '../../lib/ItemUtil'; +import TopBase, { TopBaseProps } from '../lib/TopBase'; class ConferenceTop extends TopBase { constructor(props: TopBaseProps) { super(props); - this.type = "conference"; - this.label = "Conference"; + this.type = 'conference'; + this.label = 'Conference'; this.icon = iconFile; - this.description = "[en]Electrical presentation files for conference.[/en][ja]学会発表[/ja]"; + this.description = '[en]Electrical presentation files for conference.[/en][ja]学会発表[/ja]'; this.subTypes = ItemConferenceSubTypes; } } diff --git a/src/database/item-type/conference/ConferenceUtil.tsx b/src/database/item-type/conference/ConferenceUtil.tsx index 31f3fa1..13ad72d 100644 --- a/src/database/item-type/conference/ConferenceUtil.tsx +++ b/src/database/item-type/conference/ConferenceUtil.tsx @@ -1,6 +1,6 @@ -import React from "react"; -import { MultiLang } from "../../../config"; -import { ItemConference, ItemConferenceSubType, ItemConferenceSubTypes } from "../../lib/ItemUtil"; +import React from 'react'; +import { MultiLang } from '../../../config'; +import { ItemConference, ItemConferenceSubType, ItemConferenceSubTypes } from '../../lib/ItemUtil'; interface PresentationTypeProps { lang: MultiLang; @@ -12,7 +12,7 @@ const PresentationType: React.FC
-
{item.data_file_mimetype} diff --git a/src/database/item-type/files/FilesTop.tsx b/src/database/item-type/files/FilesTop.tsx index 64c56fa..3f91270 100644 --- a/src/database/item-type/files/FilesTop.tsx +++ b/src/database/item-type/files/FilesTop.tsx @@ -1,14 +1,14 @@ -import iconFile from "../../assets/images/icon_files.gif"; -import { ItemFilesSubTypes } from "../../lib/ItemUtil"; -import TopBase, { TopBaseProps } from "../lib/TopBase"; +import iconFile from '../../assets/images/icon_files.gif'; +import { ItemFilesSubTypes } from '../../lib/ItemUtil'; +import TopBase, { TopBaseProps } from '../lib/TopBase'; class FilesTop extends TopBase { constructor(props: TopBaseProps) { super(props); - this.type = "files"; - this.label = "Files"; + this.type = 'files'; + this.label = 'Files'; this.icon = iconFile; - this.description = "[en]Various type of File.[/en][ja]ファイル[/ja]"; + this.description = '[en]Various type of File.[/en][ja]ファイル[/ja]'; this.subTypes = ItemFilesSubTypes; } } diff --git a/src/database/item-type/files/index.tsx b/src/database/item-type/files/index.tsx index 116672f..c34c2d7 100644 --- a/src/database/item-type/files/index.tsx +++ b/src/database/item-type/files/index.tsx @@ -1,7 +1,7 @@ -import FilesAdvancedSearch from "./FilesAdvancedSearch"; -import FilesDetail from "./FilesDetail"; -import FilesList from "./FilesList"; -import FilesTop from "./FilesTop"; +import FilesAdvancedSearch from './FilesAdvancedSearch'; +import FilesDetail from './FilesDetail'; +import FilesList from './FilesList'; +import FilesTop from './FilesTop'; const ItemTypeFiles = { Top: FilesTop, diff --git a/src/database/item-type/index.tsx b/src/database/item-type/index.tsx index 09102ba..2e0a993 100644 --- a/src/database/item-type/index.tsx +++ b/src/database/item-type/index.tsx @@ -1,7 +1,21 @@ -import React from 'react'; -import { MultiLang, BrainAtlasType } from '../../config'; +import { BrainAtlasType, MultiLang } from '../../config'; import AdvancedSearchQuery from '../lib/AdvancedSearchQuery'; -import { Item, ItemBinder, ItemBook, ItemConference, ItemData, ItemFiles, ItemModel, ItemPaper, ItemPresentation, ItemSimulator, ItemStimulus, ItemTool, ItemUrl, ItemMemo } from '../lib/ItemUtil'; +import { + Item, + ItemBinder, + ItemBook, + ItemConference, + ItemData, + ItemFiles, + ItemMemo, + ItemModel, + ItemPaper, + ItemPresentation, + ItemSimulator, + ItemStimulus, + ItemTool, + ItemUrl, +} from '../lib/ItemUtil'; import ItemTypeBinder from './binder'; import ItemTypeBook from './book'; import ItemTypeConference from './conference'; @@ -17,166 +31,168 @@ import ItemTypeTool from './tool'; import ItemTypeUrl from './url'; interface TopProps { - lang: MultiLang; - itemType: string; - type: BrainAtlasType; + lang: MultiLang; + itemType: string; + type: BrainAtlasType; } const Top = (props: TopProps) => { - const { lang, itemType, type } = props; - switch (itemType) { - case 'xnpbinder': - return
{label.length !== 0 && }
- {keyMonth !== "" && (
-
);
}
@@ -158,7 +190,7 @@ class AdvancedSearchBase extends React.Component|
@@ -54,9 +60,9 @@ const CreativeCommons: React.FC |
- This work is licensed under a{" "} + This work is licensed under a{' '} - Criative Commons {label} 4.0 International License + Creative Commons {label} 4.0 International License . | diff --git a/src/database/item-type/lib/field/DateTime.tsx b/src/database/item-type/lib/field/DateTime.tsx index aa97e35..22b057e 100644 --- a/src/database/item-type/lib/field/DateTime.tsx +++ b/src/database/item-type/lib/field/DateTime.tsx @@ -1,6 +1,7 @@ -import moment from "moment"; -import React from "react"; -import { MultiLang } from "../../../../config"; +import React from 'react'; + +import moment from 'moment'; +import { MultiLang } from '../../../../config'; interface Props { lang: MultiLang; @@ -8,12 +9,12 @@ interface Props { onlyDate?: boolean; } -const DateTime: React.FC|||||
| Type | : {data.mime_type} | -{downloadLimit === 0 && |
+
+ {downloadLimit === 0 && (
+ |
|||
| Size | @@ -60,7 +80,9 @@ const ItemFile: React.FC
({Functions.mlang("[en]File has been removed[/en][ja]ファイルは削除されました[/ja]", lang)}) +
( + {Functions.mlang('[en]File has been removed[/en][ja]ファイルは削除されました[/ja]', lang)} + ) )} diff --git a/src/database/item-type/lib/field/ItemIndex.tsx b/src/database/item-type/lib/field/ItemIndex.tsx index 4f49001..89e3776 100644 --- a/src/database/item-type/lib/field/ItemIndex.tsx +++ b/src/database/item-type/lib/field/ItemIndex.tsx @@ -1,9 +1,10 @@ -import React from "react"; -import { Link } from "react-router-dom"; -import { BrainAtlasType, MultiLang } from "../../../../config"; -import Functions from "../../../../functions"; -import IndexUtil from "../../../lib/IndexUtil"; -import { ItemBasicIndex } from "../../../lib/ItemUtil"; +import React from 'react'; + +import { Link } from 'react-router-dom'; +import { BrainAtlasType, MultiLang } from '../../../../config'; +import Functions from '../../../../functions'; +import IndexUtil from '../../../lib/IndexUtil'; +import { ItemBasicIndex } from '../../../lib/ItemUtil'; interface Props { lang: MultiLang; @@ -11,13 +12,13 @@ interface Props { type: BrainAtlasType; } -const ItemIndex: React.FC
-
-
-
+
+
+
+ );
+};
export default LicenseAgreementDialog;
diff --git a/src/database/item-type/lib/field/Preview.module.css b/src/database/item-type/lib/field/Preview.module.css
index 7d1e2aa..351a794 100644
--- a/src/database/item-type/lib/field/Preview.module.css
+++ b/src/database/item-type/lib/field/Preview.module.css
@@ -4,7 +4,7 @@
}
.previewBox::after {
- content: "";
+ content: '';
display: block;
clear: both;
}
diff --git a/src/database/item-type/lib/field/Preview.tsx b/src/database/item-type/lib/field/Preview.tsx
index 83ac472..167168d 100644
--- a/src/database/item-type/lib/field/Preview.tsx
+++ b/src/database/item-type/lib/field/Preview.tsx
@@ -1,10 +1,12 @@
-import React from "react";
-import Lightbox from "react-image-lightbox";
-import "react-image-lightbox/style.css";
-import { BrainAtlasType, MultiLang } from "../../../../config";
-import Functions from "../../../../functions";
-import ItemUtil, { ItemBasicFile } from "../../../lib/ItemUtil";
-import styles from "./Preview.module.css";
+import React from 'react';
+
+import Lightbox, { SlideImage } from 'yet-another-react-lightbox';
+import { BrainAtlasType, MultiLang } from '../../../../config';
+import Functions from '../../../../functions';
+import ItemUtil, { ItemBasicFile } from '../../../lib/ItemUtil';
+
+import 'yet-another-react-lightbox/styles.css';
+import styles from './Preview.module.css';
interface Props {
lang: MultiLang;
@@ -12,75 +14,49 @@ interface Props {
type: BrainAtlasType;
}
-interface State {
- isOpen: boolean;
- imageIndex: number;
-}
+const Preview: React.FC
- {Functions.mlang("[en]Download file information[/en][ja]ダウンロードするファイルの情報[/ja]", lang)}
-
-
- {this.props.file.original_file_name}
-
-
-
-
-
- -
| Type | -: {this.props.file.mime_type} | -
| Size | -
- : |
-
| Last updated | -
- : |
-
-
- {Functions.mlang("[en]License agreement[/en][ja]ファイルのライセンス[/ja]", lang)}
-
-
- {Functions.mlang("[en]Please read the following license agreement carefully.[/en][ja]このファイルには下記のライセンスが設定されています。[/ja]", lang)}
-
-
-
- - {Functions.mlang("[en]I do not accept the terms in the license agreement.[/en][ja]ライセンスに同意しません。[/ja]", lang)} -
-
- - - {Functions.mlang("[en]I do not accept the terms in the license agreement.[/en][ja]ライセンスに同意しません。[/ja]", lang)} -
-
-
- Acceptance is needed to download this file.
+ {Functions.mlang(
+ '[en]Download file information[/en][ja]ダウンロードするファイルの情報[/ja]',
+ lang,
+ )}
+
-
- );
- }
-}
+
+ {file.original_file_name}
- - - - +
+
+
- - - - +
| Type | +: {file.mime_type} | +
| Size | +
+ : |
+
| Last updated | +
+ : |
+
+
+ {Functions.mlang('[en]License agreement[/en][ja]ファイルのライセンス[/ja]', lang)}
+
+
+ {Functions.mlang(
+ '[en]Please read the following license agreement carefully.[/en][ja]このファイルには下記のライセンスが設定されています。[/ja]',
+ lang,
+ )}
+
+
+
+ + {Functions.mlang( + '[en]I do not accept the terms in the license agreement.[/en][ja]ライセンスに同意しません。[/ja]', + lang, + )} +
+
+ + + {Functions.mlang( + '[en]I do not accept the terms in the license agreement.[/en][ja]ライセンスに同意しません。[/ja]', + lang, + )} +
+
+
+ Acceptance is needed to download this file.
+
+ + + + +
+ + + + + +
{previews}
- {isOpen && (
- {previews}
+ {isOpen && | Item summary | -
|---|
| Item summary | +
|---|
{Functions.mlang(item.journal, lang)} {item.publication_year} - {item.volume !== null && " ;" + item.volume} - {item.number !== null && " (" + item.number + ")"} - {item.page !== "" && " :" + item.page} - {item.pubmed_id !== "" && ( + {item.volume !== null && ' ;' + item.volume} + {item.number !== null && ' (' + item.number + ')'} + {item.page !== '' && ' :' + item.page} + {item.pubmed_id !== '' && ( <> - {" "} + {' '} [PMID:
-
+
- Link to {item.url} - - ); - } + renderBody() { + const { lang } = this.props; + const item = this.props.item as ItemUrl; + return ( + <> + {Functions.mlang(item.title, lang)} +
+ Link to{' '} + + {item.url} + + + ); + } } -export default UrlList; \ No newline at end of file +export default UrlList; diff --git a/src/database/item-type/url/UrlTop.tsx b/src/database/item-type/url/UrlTop.tsx index ed0c472..7737780 100644 --- a/src/database/item-type/url/UrlTop.tsx +++ b/src/database/item-type/url/UrlTop.tsx @@ -2,14 +2,13 @@ import TopBase, { TopBaseProps } from '../lib/TopBase'; import iconFile from '../../assets/images/icon_url.gif'; class UrlTop extends TopBase { - - constructor(props: TopBaseProps) { - super(props); - this.type = 'url'; - this.label = 'Url'; - this.icon = iconFile; - this.description = '[en]Link information.[/en][ja]関連リンク[/ja]'; - } + constructor(props: TopBaseProps) { + super(props); + this.type = 'url'; + this.label = 'Url'; + this.icon = iconFile; + this.description = '[en]Link information.[/en][ja]関連リンク[/ja]'; + } } -export default UrlTop; \ No newline at end of file +export default UrlTop; diff --git a/src/database/item-type/url/UrlUtil.tsx b/src/database/item-type/url/UrlUtil.tsx index 09d5be6..7dd4090 100644 --- a/src/database/item-type/url/UrlUtil.tsx +++ b/src/database/item-type/url/UrlUtil.tsx @@ -1,29 +1,30 @@ -import React from 'react'; -import { MultiLang, BrainAtlasType } from '../../../config'; +import { BrainAtlasType, MultiLang } from '../../../config'; import ItemUtil, { ItemBasicFile } from '../../lib/ItemUtil'; interface BannerFileProps { - lang: MultiLang; - file: ItemBasicFile[]; - type: BrainAtlasType; + lang: MultiLang; + file: ItemBasicFile[]; + type: BrainAtlasType; } const BannerFile = (props: BannerFileProps) => { - const { file, type } = props; - const data = file.find((value) => { - return value.file_type_name === 'url_banner_file'; - }); - if (typeof data === 'undefined') { - return null; - } - const url = ItemUtil.getFileUrl(type, data); - return ( -
diff --git a/src/database/lib/DatabaseListItem.tsx b/src/database/lib/DatabaseListItem.tsx
index b45fea9..f091aa2 100644
--- a/src/database/lib/DatabaseListItem.tsx
+++ b/src/database/lib/DatabaseListItem.tsx
@@ -1,104 +1,120 @@
-import React, { ChangeEvent } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import Loading from "../../common/lib/Loading";
-import { BrainAtlasType, MultiLang } from "../../config";
-import Functions from "../../functions";
-import ItemType from "../item-type";
-import styles from "./DatabaseListItem.module.css";
-import { Item, SearchFunc, SearchResult, SortCondition, SortConditionLimit, SortConditionOrderBy, SortConditionOrderDir } from "./ItemUtil";
+import React from 'react';
+
+import { Link, useLocation, useNavigate } from 'react-router-dom';
+import Loading from '../../common/lib/Loading';
+import { BrainAtlasType, MultiLang } from '../../config';
+import Functions from '../../functions';
+import ItemType from '../item-type';
+import styles from './DatabaseListItem.module.css';
+import {
+ Item,
+ SearchFunc,
+ SearchResult,
+ SortCondition,
+ SortConditionLimit,
+ SortConditionOrderBy,
+ SortConditionOrderDir,
+} from './ItemUtil';
const SORT_CONDITION_DEFAULT: SortCondition = {
limit: 20,
page: 1,
- orderBy: "title",
+ orderBy: 'title',
orderDir: 1,
};
-const SORT_CONDITION_RANGE_ORDER_BY = ["title", "doi", "last_update_date", "creation_date", "publication_date"];
-const SORT_CONDITION_RANGE_ORDER_DIR = ["0", "1"];
-const SORT_CONDITION_RANGE_LIMIT = ["20", "50", "100"];
+const SORT_CONDITION_RANGE_ORDER_BY = [
+ 'title',
+ 'doi',
+ 'last_update_date',
+ 'creation_date',
+ 'publication_date',
+];
+const SORT_CONDITION_RANGE_ORDER_DIR = ['0', '1'];
+const SORT_CONDITION_RANGE_LIMIT = ['20', '50', '100'];
-interface PropsFC {
+interface Props {
lang: MultiLang;
url: string;
search: SearchFunc;
type: BrainAtlasType;
}
-interface Props extends PropsFC {
- location: any;
- navigate: any;
-}
+const DatabaseListItem: React.FC|
Order by
- |
No.Item per page
- | |
{pageLinks}
;
- }
+ };
- render() {
- const { lang, type } = this.props;
- if (this.state.loading) {
- return No items found.
; - } - const startNum = 1 + this.state.condition.limit * (this.state.condition.page - 1); - let endNum = this.state.condition.limit * this.state.condition.page; - if (endNum > result.total) { - endNum = result.total; - } - const pageNavi = this.renderPageNavi(result); - const items = result.data.map((item: Item, idx) => { - const evenodd = idx % 2 === 0 ? "even" : "odd"; - return ( -No items found.
; + } + const startNum = 1 + condition.limit * (condition.page - 1); + let endNum = condition.limit * condition.page; + if (endNum > result.total) { + endNum = result.total; + } + const pageNavi = renderPageNavi(result); + const items = result.data.map((item: Item, idx) => { + const evenodd = idx % 2 === 0 ? 'even' : 'odd'; return ( - <> - {this.renderSortCriteria()} -- {startNum} - {endNum} of {result.total} Items -
- {pageNavi} -+ {startNum} - {endNum} of {result.total} Items +
+ {pageNavi} +)?", "g"); - text = text.replace(re, ""); + const re = new RegExp('\\[/?(?:[^\\]]+\\|)?' + lang + '(?:\\|[^\\]]+)?\\](?:
)?', 'g'); + text = text.replace(re, ''); // eliminate description between the other language tags. mlLangs.forEach((mlLang) => { if (mlLang !== lang) { - const re = XRegExp("\\[(?:[^/][^\\]]+\\|)?" + mlLang + "(?:\\|[^\\]]+)?\\].*?\\[/(?:[^\\]]+\\|)?" + mlLang + "(?:\\|[^\\]]+)?\\](?:
)?", "isg"); + const re = XRegExp( + '\\[(?:[^/][^\\]]+\\|)?' + + mlLang + + '(?:\\|[^\\]]+)?\\].*?\\[/(?:[^\\]]+\\|)?' + + mlLang + + '(?:\\|[^\\]]+)?\\](?:
)?', + 'isg', + ); text = text.replace(re, (whole) => { - return whole.match(/<\/table>/) ? whole : ""; + return whole.match(/<\/table>/) ? whole : ''; }); } }); // unescape brackets inside of - text = text.replace(/(