未病データベース-カタログ登録機能追加

Author: rand-honda

app/models/registration-schema.ts

@@ -31,6 +31,7 @@ export interface Page {
     questions: Question[];
     type?: 'object';
     description?: string;
+    clipboardCopyPaste: boolean;
 }
 
 export interface Schema {

app/models/schema-block.ts

@@ -22,9 +22,15 @@ export default class SchemaBlockModel extends OsfModel implements SchemaBlock {
     @attr('number') index?: number;
     @attr('string') pattern?: string;
     @attr('boolean') spaceNormalization?: boolean;
-    @attr('boolean') autoDate?: boolean;
-    @attr('boolean') autoTitle?: boolean;
-    @attr('boolean') hideProjectmetadata?: boolean;
+    @attr('string') getRetrievalTitle?: string;
+    @attr('string') getRetrievalDate?: string;
+    @attr('boolean') concealmentPageNavigator?: boolean;
+    @attr('string') requiredAllCheck?: string;
+    @attr('boolean') multiLanguage?: boolean;
+    @attr('string') getRetrievalVersion?: string;
+    @attr('boolean') getEdit?: boolean;
+    @attr('boolean') sentence?: boolean;
+    @attr('string') rowAdditionCaption?: string;
 
     @belongsTo('registration-schema', { inverse: 'schemaBlocks', async: false })
     schema?: RegistrationSchemaModel;

app/packages/registration-schema/get-pages.ts

@@ -3,15 +3,16 @@ import { SchemaBlock } from 'ember-osf-web/packages/registration-schema';
 export function getPages(blocks: SchemaBlock[]) {
     const pageArray = blocks.reduce(
         (pages, block) => {
+            // instantiate first page if the schema doesn't start with a page-heading
             if (pages.length === 0 && block.blockType !== 'page-heading'
-                && (block.hideProjectmetadata === true || block.hideProjectmetadata === undefined)) {
+                && (block.concealmentPageNavigator === true || block.concealmentPageNavigator === undefined)) {
                 const blankPage: SchemaBlock[] = [];
                 pages.push(blankPage);
             }
 
-            const lastPage: SchemaBlock[] = pages.slice(-1)[0] || [];
+            const lastPage: SchemaBlock[] = pages.slice(-1)[0];
             if (block.blockType === 'page-heading'
-                && (block.hideProjectmetadata === false || block.hideProjectmetadata === undefined)) {
+                && (block.concealmentPageNavigator === false || block.concealmentPageNavigator === undefined)) {
                 pages.push([block]);
             } else {
                 lastPage.push(block);

app/packages/registration-schema/get-schema-block-group.ts

@@ -43,6 +43,7 @@ export function getSchemaBlockGroups(blocks: SchemaBlock[] | undefined) {
             case 'jgn-program-name-ja-input':
             case 'jgn-program-name-en-input':
             case 'e-rad-award-funder-input':
+            case 'single-select-pulldown-input':
             case 'pulldown-input':
             case 'e-rad-award-number-input':
             case 'e-rad-award-title-ja-input':
@@ -53,6 +54,7 @@ export function getSchemaBlockGroups(blocks: SchemaBlock[] | undefined) {
             case 'e-rad-researcher-name-en-input':
             case 'e-rad-bunnya-input':
             case 'file-metadata-input':
+            case 'ad-metadata-input':
             case 'date-input':
             case 'section-heading':
             case 'subsection-heading':

app/packages/registration-schema/index.ts

@@ -2,7 +2,12 @@ export { getPages } from './get-pages';
 export { getSchemaBlockGroups } from './get-schema-block-group';
 export { SchemaBlock, SchemaBlockType } from './schema-block';
 export { SchemaBlockGroup } from './schema-block-group';
-export { buildValidation, buildMetadataValidations, setupEventForSyncValidation } from './validations';
+export {
+    buildValidation,
+    buildMetadataValidations,
+    setupEventForSyncValidation,
+    setupEventForSyncValidation2,
+} from './validations';
 export {
     FileReference,
     RegistrationResponse,

app/packages/registration-schema/page-manager.ts

@@ -10,21 +10,22 @@ import {
     SchemaBlock,
     SchemaBlockGroup,
     setupEventForSyncValidation,
+    setupEventForSyncValidation2,
 } from 'ember-osf-web/packages/registration-schema';
 import { RegistrationResponse } from 'ember-osf-web/packages/registration-schema/registration-response';
 
 export class PageManager {
     changeset?: ChangesetDef;
     schemaBlockGroups?: SchemaBlockGroup[];
     pageHeadingText?: string;
-    hideProjectmetadata?: boolean;
+    concealmentPageNavigator?: boolean;
     isVisited?: boolean;
 
     constructor(pageSchemaBlocks: SchemaBlock[], registrationResponses: RegistrationResponse, node?: NodeModel) {
         this.schemaBlockGroups = getSchemaBlockGroups(pageSchemaBlocks);
         if (this.schemaBlockGroups) {
             this.pageHeadingText = this.schemaBlockGroups[0].labelBlock!.displayText!;
-            this.hideProjectmetadata = this.schemaBlockGroups[0].labelBlock!.hideProjectmetadata!;
+            this.concealmentPageNavigator = this.schemaBlockGroups[0].labelBlock!.concealmentPageNavigator!;
 
             this.isVisited = this.schemaBlockGroups.some(
                 ({ registrationResponseKey: key }) => Boolean(key && (key in registrationResponses)),
@@ -36,8 +37,11 @@ export class PageManager {
                 lookupValidator(validations),
                 validations,
             ) as ChangesetDef;
+
             setupEventForSyncValidation(this.changeset, this.schemaBlockGroups);
 
+            setupEventForSyncValidation2(this.changeset, this.schemaBlockGroups);
+
             if (this.isVisited) {
                 this.changeset.validate();
             }

app/packages/registration-schema/schema-block.ts

@@ -17,6 +17,7 @@ export type SchemaBlockType =
     'jgn-program-name-ja-input' |
     'jgn-program-name-en-input' |
     'e-rad-award-funder-input' |
+    'single-select-pulldown-input' |
     'pulldown-input' |
     'e-rad-award-number-input' |
     'e-rad-award-title-ja-input' |
@@ -27,6 +28,7 @@ export type SchemaBlockType =
     'e-rad-researcher-name-en-input' |
     'e-rad-bunnya-input' |
     'file-metadata-input' |
+    'ad-metadata-input' |
     'date-input' |
     'array-input';
 
@@ -44,7 +46,12 @@ export interface SchemaBlock {
     index?: number;
     pattern?: string;
     spaceNormalization?: boolean;
-    autoDate?: boolean;
-    autoTitle?: boolean;
     hideProjectmetadata?: boolean;
+    getRetrievalTitle?: string;
+    getRetrievalDate?: string;
+    concealmentPageNavigator?: boolean;
+    requiredAllCheck?: string;
+    multiLanguage?: boolean;
+    getRetrievalVersion?: string;
+    rowAdditionCaption?: string;
 }

app/packages/registration-schema/validations.ts

@@ -161,6 +161,47 @@ export function setupEventForSyncValidation(changeset: ChangesetDef, groups: Sch
     });
 }
 
+export function setupEventForSyncValidation2(changeset: ChangesetDef, groups: SchemaBlockGroup[]) {
+    const requiredAllCheckGroups = groups
+        // ignore GRDM file specific fields
+        .filter((group: SchemaBlockGroup) => !group.registrationResponseKey
+            || !group.registrationResponseKey.match(/^__responseKey_grdm-file:.+$/))
+        .filter((group: SchemaBlockGroup) => group.inputBlock && group.inputBlock.requiredAllCheck);
+
+    let isProcesing = false;
+
+    changeset.on('afterValidation', () => {
+        if (isProcesing) {
+            return;
+        }
+        isProcesing = true;
+
+        try {
+            const checkboxList = requiredAllCheckGroups.map(group => {
+                const registrationResponseKey: string = group.registrationResponseKey || '';
+                const value = changeset.get(registrationResponseKey);
+                return Array.isArray(value) && value.length === 1;
+            });
+
+            requiredAllCheckGroups
+                .forEach(group => {
+                    if (!checkboxList.includes(false)) {
+                        const todayDate = `${new Date().getFullYear()}/${
+                            String(new Date().getMonth() + 1).padStart(2, '0')
+                        }/${
+                            String(new Date().getDate()).padStart(2, '0')
+                        }`;
+                        changeset.set(`__responseKey_${group.inputBlock!.requiredAllCheck}`, todayDate);
+                    } else {
+                        changeset.set(`__responseKey_${group.inputBlock!.requiredAllCheck}`, '');
+                    }
+                });
+        } finally {
+            isProcesing = false;
+        }
+    });
+}
+
 export function validateNodeLicense() {
     return async (_: unknown, __: unknown, ___: unknown, changes: DraftRegistration, content: DraftRegistration) => {
         let validateLicenseTarget = await content.license;

lib/osf-components/addon/components/contributor-list/component.ts

@@ -60,7 +60,15 @@ export default class ContributorList extends Component {
             this.set('totalContributors', nextPage.meta.total);
         } else {
             this.set('page', 1);
-            const firstPage = yield this.node.bibliographicContributors;
+            const firstPage = yield this.node.queryHasMany(
+                'bibliographicContributors',
+                {
+                    fields: {
+                        users: 'full_name,given_name,family_name,id,links',
+                    },
+                    page: { size: 10 },
+                },
+            );
             this.setProperties({
                 displayedContributors: firstPage.toArray(),
                 totalContributors: firstPage.meta.total,

lib/osf-components/addon/components/form-controls/template.hbs

@@ -14,13 +14,6 @@
         shouldShowMessages=this.shouldShowMessages
         disabled=this.disabled
     )
-    autodate=(
-        component
-        'validated-input/autodate'
-        changeset=@changeset
-        shouldShowMessages=this.shouldShowMessages
-        disabled=this.disabled
-    )
     recaptcha=(
         component
         'validated-input/recaptcha'