Skip to content

Commit

Permalink
Merge pull request #10 from gdcc/develop
Browse files Browse the repository at this point in the history 
Adding betatest folder with MapView update and new ZipPreviewer
  • Loading branch information
@qqmyers
qqmyers authored Sep 21, 2022
2 parents c54d96e + f1639d5 commit a0a3a37
Show file tree
Hide file tree
Showing 39 changed files with 83,496 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/.project
/.settings
70 changes: 70 additions & 0 deletions 5.2curlcommands.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,3 +509,73 @@ curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin
"contentType":"application/geo+json"
}'
```

##Beta Versions:
As updates are made, they will be added to a /betatest sub-folder which will make them accessible to users via github.io without affecting people who are using the latest numbered release (e.g. v1.3). When previewers in the betatest branch are included in the next release (e.g. v1.4), sites may wish to change their registration of the tools to use the stable version as the betatest version may continue to receive changes.


###MapViewer:
Adds properties to geojson preview

```bash
curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
'{
"displayName":"View Map",
"description":"View a map of the file.",
"toolName":"mapPreviewer",
"scope":"file",
"types":["preview"],
"toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/betatest/MapPreview.html",
"toolParameters": {
"queryParameters":[
{"fileid":"{fileId}"},
{"siteUrl":"{siteUrl}"},
{"key":"{apiToken}"},
{"datasetid":"{datasetId}"},
{"datasetversion":"{datasetVersion}"},
{"locale":"{localeCode}"}
]
},
"contentType":"application/geo+json"
}'
```

### ZIP Previewer Requirements:
* Dataverse version v5.12+
* Local file storage or S3 with direct download configured
* When using S3 storage: Extended CORS rule settings for the S3 bucket (see also: https://guides.dataverse.org/en/latest/developers/big-data-support.html#s3-direct-upload-and-download)
```json
{
"CORSRules": [
{
"AllowedOrigins": ["*"],
"AllowedHeaders": ["*"],
"AllowedMethods": ["PUT", "GET", "HEAD"],
"ExposeHeaders": ["ETag", "Accept-Ranges", "Content-Range", "Content-Encoding"]
}
]
}
```

```bash
curl -X POST -H 'Content-type: application/json' http://localhost:8080/api/admin/externalTools -d \
'{
"displayName":"Preview Zip file",
"description":"Preview the structure of a Zip file.",
"toolName":"zipPreviewer",
"scope":"file",
"types":["preview"],
"toolUrl":"https://gdcc.github.io/dataverse-previewers/previewers/betatest/ZipPreview.html",
"toolParameters": {
"queryParameters":[
{"fileid":"{fileId}"},
{"siteUrl":"{siteUrl}"},
{"key":"{apiToken}"},
{"datasetid":"{datasetId}"},
{"datasetversion":"{datasetVersion}"},
{"locale":"{localeCode}"}
]
},
"contentType":"application/zip"
}'
```
33 changes: 33 additions & 0 deletions previewers/betatest/AudioPreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<html>

<head>
<meta charset="utf-8">
<title class="audioPreviewText">Audio Preview</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script type="text/javascript" src="js/audio.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<link type="text/css" rel="stylesheet" href="css/preview.css" />
</head>

<body class="container">
<main>
<img id='logo' alt='Site Logo'>
<h1 class="page-title audioPreviewText">Audio Preview</h1>
<div class='preview-container'>
<div class='preview-header'></div>
<div class='preview'></div>
</div>
</main>
</body>

</html>
33 changes: 33 additions & 0 deletions previewers/betatest/HtmlPreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<html>

<head>
<meta charset="utf-8">
<title class="htmlPreviewText">Html Preview</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script type="text/javascript" src="js/html.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<link type="text/css" rel="stylesheet" href="css/preview.css" />
</head>

<body class="container">
<main>
<img id='logo' alt='Site Logo'>
<h1 class="page-title htmlPreviewText">Html Preview</h1>
<div class='preview-container'>
<div class='preview-header'></div>
<div class='preview'></div>
</div>
</main>
</body>

</html>
35 changes: 35 additions & 0 deletions previewers/betatest/HypothesisPreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<html>

<head>
<meta charset="utf-8">
<title class="annotationsText">Annotations</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script type="text/javascript" src="js/showdown.min.js"></script>
<script type="text/javascript" src="js/showdown-xss-filter.js"></script>
<script type="text/javascript" src="js/hypothesis.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<link type="text/css" rel="stylesheet" href="css/preview.css" />
</head>

<body class="container">
<main>
<img id='logo' alt='Site Logo'>
<h1 class="page-title">
<a href="https://qdr.syr.edu/ati">ATI</a><span class="annotationsText">Annotations</span>
</h1>
<div class='preview-header'></div>
<div class="hypothesis"></div>
</main>
</body>

</html>
34 changes: 34 additions & 0 deletions previewers/betatest/ImagePreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<html>

<head>
<meta charset="utf-8">
<title class="imagePreviewText">Image Preview</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script type="text/javascript" src="js/image.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-zoom/1.7.21/jquery.zoom.min.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<link type="text/css" rel="stylesheet" href="css/preview.css" />
</head>

<body class="container">
<main>
<img id='logo' alt='Site Logo'>
<h1 class="page-title imagePreviewText">Image Preview</h1>
<div class='preview-container'>
<div class='preview-header'></div>
<div class='preview'></div>
</div>
</main>
</body>

</html>
36 changes: 36 additions & 0 deletions previewers/betatest/MapPreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<html>
<head>
<meta charset="utf-8">
<title class="mapPreviewText">Map Preview</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<!-- Leaflet -->
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==" crossorigin="anonymous"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin="anonymous"></script>
<link type="text/css" rel="stylesheet" href="css/preview.css" />
</head>

<body class="container">
<main>
<img id='logo' alt='Site Logo'>
<h1 class="page-title mapPreviewText">Map Preview</h1>
<div class='preview-container'>
<div class='preview-header'></div>
<div class='preview'>
<div id="map" style="width: 800px; height: 500px;"></div>
</div>
</div>
</main>
<script type="text/javascript" src="js/map.js"></script>
</body>
</html>
61 changes: 61 additions & 0 deletions previewers/betatest/PDFPreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<html>

<head>
<meta charset="utf-8">
<title class="pdfPreviewText">PDF Preview</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script type="text/javascript" src="js/pdfpreview.js"></script>
<script type="text/javascript" src="js/pdf.js"></script>
<script type="text/javascript" src="js/pdf.worker.js"></script>
<script type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/jquery-zoom/1.7.21/jquery.zoom.min.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<link type="text/css" rel="stylesheet" href="css/preview.css" />
<link type="text/css" rel="stylesheet" href="css/lds-spinner.css" />

</head>

<body class="container">
<main>
<img id='logo' alt='Site Logo'>
<h1 class="page-title pdfPreviewText">PDF Preview</h1>
<div class='preview-container'>
<div class='preview-header'></div>
<div class='preview'>
<div>
<button id="prev">Previous</button>
<button id="next">Next</button>
&nbsp; &nbsp;
<span class="pageText">Page:</span> <span id="page_num"></span> / <span id="page_count"></span>
</div>
<div class="lds-spinner">
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
</div>
<canvas id="the-canvas"></canvas>
</div>
</div>
</main>
</body>

</html>
40 changes: 40 additions & 0 deletions previewers/betatest/SpreadsheetPreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<html>

<head>
<meta charset="utf-8">
<title class="spreadsheetViewerText">Spreadsheet Viewer</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script src="https://cdn.jsdelivr.net/handsontable/0.28.4/handsontable.full.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/papaparse@5"></script>
<script type="text/javascript" src="js/spreadsheet.js"></script>
<script type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/jquery-zoom/1.7.21/jquery.zoom.min.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/handsontable/0.28.4/handsontable.full.min.css">
<link type="text/css" rel="stylesheet" href="css/preview.css" />
</head>

<body class="container">
<main>
<img id='logo' alt='Site Logo'>
<h1 class="page-title spreadsheetViewerText">Spreadsheet Viewer</h1>
<div class='preview-container'>
<div class='preview-header'></div>
<div class='preview'>
<div id="handsontable-container"></div>
</div>
</div>
</main>
</body>

</html>
32 changes: 32 additions & 0 deletions previewers/betatest/TextPreview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<html>

<head>
<meta charset="utf-8">
<title class="textPreviewText">Text Preview</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="js/xss.js"></script>
<script type="text/javascript" src="js/text.js"></script>
<script src="lib/jquery.i18n.js"></script>
<script src="lib/jquery.i18n.messagestore.js"></script>
<script src="lib/jquery.i18n.language.js"></script>
<script type="text/javascript" src="js/retriever.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"
integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css"
integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
<link type="text/css" rel="stylesheet" href="css/preview.css" />
</head>

<body class="container">
<main><img id='logo' alt='Site Logo'>
<h1 class="page-title textPreviewText">Text Preview</h1>
<div class='preview-container'>
<div class='preview-header'></div>
<div class='preview'></div>
</div>
</main>
</body>

</html>
Loading

0 comments on commit a0a3a37

Please sign in to comment.