Skip to content

Commit b5d94f0

Browse files
nellhnellh
authored
Merge pull request #3322 from OpenNeuroOrg/feat/progressive-loading-validation
Progressive loading for schema validator output
2 parents 769d876 + c1325b2 commit b5d94f0

File tree

20 files changed

+223
-545
lines changed

20 files changed

+223
-545
lines changed

‎packages/openneuro-app/src/scripts/datalad/dataset/dataset-query-fragments.js‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,8 @@ export const DATASET_ISSUES = gql`
135135
${ISSUE_FIELDS}
136136
}
137137
validation {
138-
codeMessages {
139-
code
140-
message
141-
}
142-
issues {
143-
${VALIDATION_FIELDS}
144-
}
138+
errors
139+
warnings
145140
}
146141
}
147142
}
@@ -154,13 +149,8 @@ export const SNAPSHOT_ISSUES = gql`
154149
${ISSUE_FIELDS}
155150
}
156151
validation {
157-
codeMessages {
158-
code
159-
message
160-
}
161-
issues {
162-
${VALIDATION_FIELDS}
163-
}
152+
errors
153+
warnings
164154
}
165155
}
166156
`

‎packages/openneuro-app/src/scripts/dataset/__tests__/__snapshots__/snapshot-container.spec.tsx.snap‎

Lines changed: 4 additions & 304 deletions
Original file line numberDiff line numberDiff line change
@@ -181,124 +181,7 @@ exports[`SnapshotContainer component > renders successfully 1`] = `
181181
</div>
182182
<div
183183
class="accordion-item collapsed "
184-
>
185-
<div
186-
class="accordion-content"
187-
>
188-
<div>
189-
<span
190-
class="message error fade-in"
191-
>
192-
We found
193-
<strong>
194-
1 Warning
195-
</strong>
196-
in your dataset. You are not required to fix warnings, but doing so will make your dataset more BIDS compliant.
197-
</span>
198-
</div>
199-
<br />
200-
<div
201-
class="validation-messages on-accordion-wrapper"
202-
>
203-
<article
204-
class="plain accordion fade-in upload-panel warning-wrap"
205-
>
206-
<div
207-
class="accordion-title "
208-
role="switch"
209-
>
210-
<span>
211-
view 1 warning in 1 file
212-
</span>
213-
</div>
214-
<div
215-
class="accordion-item collapsed "
216-
>
217-
<div
218-
class="accordion-content"
219-
>
220-
<div
221-
class=" on-accordion-wrapper"
222-
>
223-
<article
224-
class="plain accordion validation-error fade-in"
225-
>
226-
<div
227-
class="accordion-title "
228-
role="switch"
229-
>
230-
<span
231-
class="file-header"
232-
>
233-
<h4
234-
class="em-header"
235-
>
236-
<strong
237-
class="em-header "
238-
>
239-
Warning: 1
240-
</strong>
241-
<span
242-
class="file-issue-count"
243-
>
244-
1 file
245-
</span>
246-
</h4>
247-
Tabular file contains custom columns not described in a data dictionary
248-
</span>
249-
</div>
250-
<div
251-
class="accordion-item collapsed "
252-
>
253-
<div
254-
class="accordion-content"
255-
>
256-
<div
257-
class="em-body"
258-
>
259-
<span
260-
class="e-meta"
261-
>
262-
<span>
263-
<label>
264-
Location:
265-
</label>
266-
<p>
267-
/participants.tsv
268-
</p>
269-
</span>
270-
</span>
271-
<span
272-
class="e-meta"
273-
>
274-
<label>
275-
Reason:
276-
</label>
277-
<p>
278-
Tabular file contains custom columns not described in a data dictionary
279-
</p>
280-
</span>
281-
<span
282-
class="e-meta"
283-
>
284-
<label>
285-
Evidence:
286-
</label>
287-
<p>
288-
Columns: sex, age not defined, please define in: /participants.json
289-
</p>
290-
</span>
291-
</div>
292-
</div>
293-
</div>
294-
</article>
295-
</div>
296-
</div>
297-
</div>
298-
</article>
299-
</div>
300-
</div>
301-
</div>
184+
/>
302185
</article>
303186
</div>
304187
</div>
@@ -670,174 +553,7 @@ OCI-1131441 (R. Poldrack, PI) in any publications.
670553
</div>
671554
<div
672555
class="accordion-item collapsed "
673-
>
674-
<div
675-
class="accordion-content"
676-
>
677-
<ul
678-
class="child-files"
679-
>
680-
<li
681-
class="clearfix filetree-item filetree-file"
682-
>
683-
<span
684-
aria-label=""
685-
class=" on-icon "
686-
role="img"
687-
style="color: orange;"
688-
>
689-
<i
690-
class="fas fa-file-alt"
691-
/>
692-
</span>
693-
  CHANGES
694-
<span
695-
class="filetree-editfile"
696-
/>
697-
</li>
698-
<li
699-
class="clearfix filetree-item filetree-file"
700-
>
701-
<span
702-
aria-label=""
703-
class=" on-icon "
704-
role="img"
705-
style="color: deepskyblue;"
706-
>
707-
<i
708-
class="fab fa-markdown"
709-
/>
710-
</span>
711-
  README
712-
<span
713-
class="filetree-editfile"
714-
/>
715-
</li>
716-
<li
717-
class="clearfix filetree-item filetree-file"
718-
>
719-
<span
720-
aria-label=""
721-
class=" on-icon "
722-
role="img"
723-
style="color: limegreen;"
724-
>
725-
<i
726-
class="fab fa-node-js"
727-
/>
728-
</span>
729-
  T1w.json
730-
<span
731-
class="filetree-editfile"
732-
/>
733-
</li>
734-
<li
735-
class="clearfix filetree-item filetree-file"
736-
>
737-
<span
738-
aria-label=""
739-
class=" on-icon "
740-
role="img"
741-
style="color: limegreen;"
742-
>
743-
<i
744-
class="fab fa-node-js"
745-
/>
746-
</span>
747-
  dataset_description.json
748-
<span
749-
class="filetree-editfile"
750-
/>
751-
</li>
752-
<li
753-
class="clearfix filetree-item filetree-file"
754-
>
755-
<span
756-
aria-label=""
757-
class=" on-icon "
758-
role="img"
759-
style="color: lightgreen;"
760-
>
761-
<i
762-
class="fas fa-file-excel"
763-
/>
764-
</span>
765-
  participants.tsv
766-
<span
767-
class="filetree-editfile"
768-
/>
769-
</li>
770-
<li
771-
class="clearfix filetree-item filetree-dir"
772-
>
773-
<article
774-
class="file-tree accordion "
775-
>
776-
<div
777-
class="accordion-title "
778-
role="switch"
779-
>
780-
<span
781-
aria-label="sub-01"
782-
class="file-icon on-icon icon-text "
783-
role="img"
784-
>
785-
<i
786-
class="fas fa-folder"
787-
/>
788-
sub-01
789-
</span>
790-
</div>
791-
<div
792-
class="accordion-item collapsed "
793-
>
794-
<div
795-
class="accordion-content"
796-
>
797-
<div>
798-
Loading...
799-
</div>
800-
</div>
801-
</div>
802-
</article>
803-
</li>
804-
<li
805-
class="clearfix filetree-item filetree-dir"
806-
>
807-
<article
808-
class="file-tree accordion "
809-
>
810-
<div
811-
class="accordion-title "
812-
role="switch"
813-
>
814-
<span
815-
aria-label="sub-02"
816-
class="file-icon on-icon icon-text "
817-
role="img"
818-
>
819-
<i
820-
class="fas fa-folder"
821-
/>
822-
sub-02
823-
</span>
824-
</div>
825-
<div
826-
class="accordion-item collapsed "
827-
>
828-
<div
829-
class="accordion-content"
830-
>
831-
<div>
832-
Loading...
833-
</div>
834-
</div>
835-
</div>
836-
</article>
837-
</li>
838-
</ul>
839-
</div>
840-
</div>
556+
/>
841557
</article>
842558
</div>
843559
</div>
@@ -1003,15 +719,7 @@ OCI-1131441 (R. Poldrack, PI) in any publications.
1003719
</div>
1004720
<div
1005721
class="accordion-item collapsed "
1006-
>
1007-
<div
1008-
class="accordion-content"
1009-
>
1010-
<div>
1011-
Loading...
1012-
</div>
1013-
</div>
1014-
</div>
722+
/>
1015723
</article>
1016724
</li>
1017725
<li
@@ -1037,15 +745,7 @@ OCI-1131441 (R. Poldrack, PI) in any publications.
1037745
</div>
1038746
<div
1039747
class="accordion-item collapsed "
1040-
>
1041-
<div
1042-
class="accordion-content"
1043-
>
1044-
<div>
1045-
Loading...
1046-
</div>
1047-
</div>
1048-
</div>
748+
/>
1049749
</article>
1050750
</li>
1051751
</ul>

0 commit comments

Comments
 (0)