We’re unable to create your Perma Link.
-{{/if}}
-{{#if offer_upload}}
- ").html(initial);
- let obj = {
- setProgress: function(progress) {
- $container.empty();
- let template = progressBarTemplate({
- 'progress': progress,
- 'id': id
- });
- $container.html(template);
- },
- appendTo: function($el) {
- $container.appendTo($el);
- }
- };
- progress_bars_by_id[id] = obj;
- return obj;
-}
-
-export function get_progress_bar_by_id(id) {
- return progress_bars_by_id[id];
-}
diff --git a/perma_web/static/js/link-batch.module.js b/perma_web/static/js/link-batch.module.js
deleted file mode 100644
index 3727013c3..000000000
--- a/perma_web/static/js/link-batch.module.js
+++ /dev/null
@@ -1,281 +0,0 @@
-let Spinner = require('spin.js');
-
-let APIModule = require('./helpers/api.module.js');
-var DOMHelpers = require('./helpers/dom.helpers.js');
-let FolderTreeModule = require('./folder-tree.module.js');
-let FolderSelectorHelper = require('./helpers/folder-selector.helper.js');
-let Helpers = require('./helpers/general.helpers.js');
-let Modals = require('./modals.module.js');
-let ProgressBarHelper = require('./helpers/progress-bar.helper.js');
-
-let batchHistoryTemplate = require("./hbs/link-batch-history.handlebars");
-let batchLinksTemplate = require("./hbs/batch-links.handlebars");
-
-let target_folder;
-let spinner = new Spinner({lines: 15, length: 10, width: 2, radius: 9, corners: 0, color: '#222222', trail: 50});
-let interval;
-
-// elements in the DOM, retrieved during init()
-let $batch_details, $batch_details_wrapper, $batch_history, $batch_list_container,
- $batch_modal_title, $batch_progress_report, $batch_target_path, $create_batch,
- $create_batch_wrapper, $export_csv, $input, $input_area, $loading, $modal,
- $spinner, $start_button;
-
-window.addEventListener('BatchLinkModule.batchCreated', function (event) {
- populate_link_batch_list();
- Helpers.triggerOnWindow("BatchLinkModule.batchCreated");
-});
-
-window.addEventListener('BatchLinkModule.batchCompleted', function (event) {
- $(window).trigger("BatchLinkModule.refreshLinkList");
-});
-
-function render_batch(links_in_batch, folder_path) {
- const steps = 6;
-
- let all_completed = true;
- let batch_progress = [];
- let errors = 0;
- links_in_batch.forEach(function(link) {
- link.progress = (link.step_count / steps) * 100;
- link.local_url = link.guid ? `${window.host}/${link.guid}` : null;
- switch(link.status){
- case "pending":
- link.isPending = true;
- all_completed = false;
- batch_progress.push(link.progress);
- break;
- case "in_progress":
- link.isProcessing = true;
- all_completed = false;
- batch_progress.push(link.progress);
- break;
- case "completed":
- link.isComplete = true;
- batch_progress.push(link.progress);
- break;
- default:
- link.isError = true;
- link.error_message = APIModule.stringFromNestedObject(JSON.parse(link.message)) || "Error processing request";
- errors += 1;
- }
- });
- let percent_complete = Math.round(batch_progress.reduce((a, b) => a + b, 0) / (batch_progress.length * 100) * 100)
- let message = `Batch ${percent_complete}% complete.`;
- if (errors > 0){
- message += `
${errors} error${errors > 1 ? 's' : ''}.`;
- }
- $batch_progress_report.html(message);
- let template = batchLinksTemplate({"links": links_in_batch, "folder": folder_path});
- $batch_details.html(template);
- if (all_completed) {
- $export_csv.removeClass("_hide");
- }
- return all_completed;
-};
-
-function handle_error(error){
- clearInterval(interval);
- APIModule.showError(error);
- $modal.modal("hide");
-}
-
-function show_batch(batch_id) {
- $batch_details_wrapper.removeClass("_hide");
- $batch_modal_title.text("Link Batch Details");
- $export_csv.attr("href", `/api/v1/archives/batches/${batch_id}/export`);
- if (!$spinner[0].childElementCount) {
- spinner.spin($spinner[0]);
- $spinner.removeClass("_hide");
- }
- let first_time = true;
- let retrieve_and_render = function() {
- APIModule.request(
- 'GET', `/archives/batches/${batch_id}`
- ).then(function(batch_data) {
- if (first_time) {
- first_time = false;
- $modal.focus();
- spinner.stop();
- $spinner.addClass("_hide");
- $batch_details.attr("aria-hidden", "true");
- // prevents tabbing to elements that are getting swapped out
- $batch_details.find('*').each(function(){$(this).attr('tabIndex', '-1')});
- }
- let folder_path = FolderTreeModule.getPathForId(batch_data.target_folder.id).join(" > ");
- let all_completed = render_batch(batch_data.capture_jobs, folder_path);
- if (all_completed) {
- clearInterval(interval);
- $batch_details.attr("aria-hidden", "false");
- // undo our special focus handling
- $batch_details.find('*').each(function(){$(this).removeAttr('tabIndex')});
- }
- }).catch(function(error){
- handle_error(error);
- });
- }
- retrieve_and_render();
- interval = setInterval(retrieve_and_render, 2000);
-}
-
-export function show_modal_with_batch(batch_id) {
- show_batch(batch_id);
- $modal.modal("show");
-}
-
-function start_batch() {
- $input.hide();
- spinner.spin($spinner[0]);
- $spinner.removeClass("_hide");
- $loading.focus();
- APIModule.request('POST', '/archives/batches/', {
- "target_folder": target_folder,
- "urls": $input_area.val().split("\n").map(s => {return s.trim()}).filter(Boolean),
- "human": true
- }).then(function(data) {
- show_batch(data.id);
- populate_link_batch_list();
- $(window).trigger("BatchLinkModule.batchCreated", data.links_remaining);
- }).catch(function(error){
- handle_error(error);
- });
-};
-
-function refresh_target_path_dropdown() {
- FolderSelectorHelper.makeFolderSelector($batch_target_path, target_folder);
- $start_button.prop('disabled', !Boolean(target_folder));
-};
-
-function set_folder_from_trigger (evt, data) {
- if (typeof data !== 'object') {
- data = JSON.parse(data);
- }
- target_folder = data.folderId;
- $batch_target_path.find("option").each(function() {
- if ($(this).val() == target_folder) {
- $(this).prop("selected", true);
- }
- });
-};
-
-function set_folder_from_dropdown(new_folder_id) {
- target_folder = new_folder_id;
-};
-
-function populate_link_batch_list(limit=7) {
- APIModule.request('GET', '/archives/batches/', {
- 'limit': limit
- }).then(function(data) {
- if (data.objects.length > 0) {
- let template = batchHistoryTemplate({'link_batches': data.objects, 'next': data.meta.next});
- $batch_history.html(template);
- $batch_list_container.removeClass('_hide');
- DOMHelpers.scrollIfTallerThanFractionOfViewport(".col-folders", 0.9);
- }
- }).catch(function(e){
- console.log(e);
- $batch_history.html('
(unavailable)
')
- });
-}
-
-function setup_handlers() {
- // listen for folder changes from other UI components
- $(window)
- .on('FolderTreeModule.selectionChange', set_folder_from_trigger)
- .on('dropdown.selectionChange', set_folder_from_trigger)
- .on('createLink.toggleProgress', () => { $create_batch_wrapper.toggle() });
-
- // update all UI components when folder changed using the modal's dropdown
- $batch_target_path.change(function() {
- let new_folder_id = $(this).val();
- if (new_folder_id) {
- $start_button.prop('disabled', false);
- set_folder_from_dropdown(new_folder_id);
- Helpers.triggerOnWindow("dropdown.selectionChange", {
- folderId: $(this).val(),
- orgId: $(this).data('orgid')
- });
- } else {
- $start_button.prop('disabled', true);
- }
- });
-
- $modal
- .on('shown.bs.modal', refresh_target_path_dropdown)
- .on('hidden.bs.modal', function() {
- $input.show();
- $input_area.val("");
- $batch_details_wrapper.addClass("_hide");
- $batch_details.empty();
- spinner.stop();
- $spinner.addClass("_hide");
- $export_csv.addClass("_hide");
- $batch_progress_report.empty();
- })
- .on('hide.bs.modal', function(){
- clearInterval(interval);
- $(window).trigger("BatchLinkModule.refreshLinkList");
- });
-
- $start_button.click(start_batch);
-
- $batch_list_container
- .on('shown.bs.collapse', function(){
- DOMHelpers.scrollIfTallerThanFractionOfViewport(".col-folders", 0.9);})
- .on('hidden.bs.collapse', function(){
- DOMHelpers.scrollIfTallerThanFractionOfViewport(".col-folders", 0.9);
- });
-
- $create_batch.click(function() {
- Modals.returnFocusTo(this);
- });
-
- $batch_history.delegate('a[data-batch]', 'click', function(e) {
- e.preventDefault();
- let batch = this.dataset.batch;
- let folderPath= this.dataset.folderpath;
- let org = parseInt(this.dataset.org);
- Helpers.triggerOnWindow('batchLink.reloadTreeForFolder', {
- folderId: folderPath.split('-'),
- orgId: org
- });
- $(window).bind("folderTree.ready.batchToggle", () => {
- $input.hide();
- show_modal_with_batch(batch);
- Modals.returnFocusTo(this);
- $(window).unbind("folderTree.ready.batchToggle");
- });
- });
-
- $batch_history.delegate('#all-batches', 'click', function(e) {
- e.preventDefault();
- populate_link_batch_list(null);
- $batch_history.focus();
- });
- };
-
-
-export function init() {
- $(function() {
- $batch_details = $('#batch-details');
- $batch_details_wrapper = $('#batch-details-wrapper');
- $batch_history = $("#batch-history");
- $batch_list_container = $('#batch-list-container');
- $batch_modal_title = $("#batch-modal-title");
- $batch_progress_report = $('#batch-progress-report');
- $batch_target_path = $('#batch-target-path');
- $create_batch = $('#create-batch');
- $create_batch_wrapper = $('#create-batch-links');
- $export_csv = $('#export-csv');
- $input = $('#batch-create-input');
- $input_area = $('#batch-create-input textarea');
- $loading = $('#loading');
- $modal = $("#batch-modal");
- $spinner = $('.spinner');
- $start_button = $('#start-batch');
-
-
- populate_link_batch_list();
- setup_handlers();
- });
-}
diff --git a/perma_web/static/js/links-list.module.js b/perma_web/static/js/links-list.module.js
deleted file mode 100644
index 58a664ad8..000000000
--- a/perma_web/static/js/links-list.module.js
+++ /dev/null
@@ -1,298 +0,0 @@
-require('waypoints/lib/jquery.waypoints.js'); // add .waypoint to jquery
-
-var DOMHelpers = require('./helpers/dom.helpers.js');
-var LinkHelpers = require('./helpers/link.helpers.js');
-var APIModule = require('./helpers/api.module.js');
-var FolderSelectorHelper = require('./helpers/folder-selector.helper.js');
-
-// templates
-let headerTemplate = require("./hbs/link-list-header.handlebars");
-let linkTemplate = require("./hbs/link.handlebars");
-
-let dragStartPosition = null;
-let lastRowToggleTime = 0;
-let selectedFolderID = null;
-
-// elements in the DOM, retrieved during init()
-let $linkListHeader, $linkTable;
-
-export function init () {
- $linkTable = $('.item-rows');
- $linkListHeader = $('#link-list-header');
-
- setupEventHandlers();
- setupLinksTableEventHandlers();
-}
-
-function setupEventHandlers () {
- $(window)
- .on("FolderTreeModule.selectionChange", function(evt, data) {
- if (typeof data !== 'object') data = JSON.parse(data);
- selectedFolderID = data.folderId;
- showFolderContents(data.folderId);
- let template = headerTemplate({
- "organization": data.orgId,
- "path": data.path.join(" > "),
- "folder": data.folderId
- });
- $linkListHeader.html(template);
- })
- .on("BatchLinkModule.batchCreated", function(){
- showFolderContents(selectedFolderID);
- })
- .on("BatchLinkModule.refreshLinkList", function(){
- showFolderContents(selectedFolderID);
- });
-
- // search form
- $('.search-query-form').on('submit', function (e) {
- e.preventDefault();
- let query = DOMHelpers.getValue('.search-query');
- if(query && query.trim()){
- showFolderContents(selectedFolderID, query);
- }
- });
-
- // scroll helper
- DOMHelpers.markIfScrolled('.col-links');
-}
-
-function getLinkIDForFormElement (element) {
- return element.closest('.item-container').find('.item-row').data('link_id');
-}
-
-function setupLinksTableEventHandlers () {
- $linkTable
- .on('click', 'a.clear-search', function (e) {
- e.preventDefault();
- showFolderContents(selectedFolderID);
- })
- .on('mousedown touchstart', '.item-row', function (e) {
- handleMouseDown(e);
- })
-
- // .item-row mouseup -- hide and show link details, if not dragging
- .on('mouseup touchend', '.item-row', function (e) {
- handleMouseUp(e);
- })
-
- // save changes to notes field
- .on('input propertychange change', '.link-notes', function () {
- let textarea = $(this);
- let guid = getLinkIDForFormElement(textarea);
- var statusElement = textarea.prevAll('.notes-save-status')
- LinkHelpers.saveInput(guid, textarea, statusElement, 'notes', ()=>{
- setTimeout(function() {
- $(statusElement).html('');
- }, 1000);
- });
- })
-
- // save changes to title field
- .on('input', '.link-title', function () {
- let textarea = $(this);
- let guid = getLinkIDForFormElement(textarea);
- var statusElement = textarea.prevAll('.title-save-status')
-
- LinkHelpers.saveInput(guid, textarea, statusElement, 'title', function (data) {
- // update display title when saved
- textarea.closest('.item-container').find('.item-title span').text(data.title);
- setTimeout(function() {
- $(statusElement).html('');
- }, 1000)
- });
- })
-
- .on('input', '.link-description', function () {
- let textarea = $(this);
- let guid = getLinkIDForFormElement(textarea);
- var statusElement = textarea.prevAll('.description-save-status')
-
- LinkHelpers.saveInput(guid, textarea, statusElement, 'description', ()=>{
- setTimeout(function() {
- $(statusElement).html('');
- }, 1000);
- });
- })
-
- .on('input', '.link-default-to-screenshot-view', function () {
- let radio = $(this);
- let guid = getLinkIDForFormElement(radio);
- var statusElement = radio.parent().parent().find('.default_to_screenshot_view-save-status');
-
- LinkHelpers.saveInput(guid, radio, statusElement, 'default_to_screenshot_view', ()=>{
- setTimeout(function() {
- $(statusElement).html('');
- }, 1000);
- });
- })
-
- // handle move-to-folder dropdown
- .on('change', '.move-to-folder', function () {
- let moveSelect = $(this);
- let data = JSON.stringify({ folderId: moveSelect.val(), linkId: getLinkIDForFormElement(moveSelect) })
- $(window).trigger("LinksListModule.moveLink", data)
- });
-}
-
-// *** actions ***
-
-let showLoadingMessage = false;
-function initShowFolderDOM (query) {
- if(!query || !query.trim()){
- // clear query after user clicks a folder
- DOMHelpers.setInputValue('.search-query', '');
- }
-
- // destroy any existing infinite scroll Waypoints
- Waypoint.destroyAll();
-
- // if fetching folder contents takes more than 500ms, show a loading message
- showLoadingMessage = true;
- setTimeout(function(){
- if(showLoadingMessage) {
- DOMHelpers.emptyElement($linkTable);
- DOMHelpers.changeHTML($linkTable, '
Loading folder contents...
');
- }
- }, 500);
-}
-
-function generateLinkFields(query, link) {
- return LinkHelpers.generateLinkFields(link, query);
-}
-
-function showFolderContents (folderID, query) {
- initShowFolderDOM(query);
-
- let requestCount = 20,
- requestData = {limit: requestCount, offset:0},
- endpoint;
-
- if (query) {
- requestData.q = query;
- }
- endpoint = '/folders/' + folderID + '/archives/';
-
- // Content fetcher.
- // This is wrapped in a function so it can be called repeatedly for infinite scrolling.
- function getNextContents() {
- APIModule.request("GET", endpoint, requestData)
- .done(function (response) {
- showLoadingMessage = false;
- let links = response.objects.map(generateLinkFields.bind(this, query));
-
- // append HTML
- if(requestData.offset === 0) {
- // first run -- initialize folder
- DOMHelpers.emptyElement($linkTable);
- } else {
- // subsequent run -- appending to folder
- let linksLoadingMore = $linkTable.find('.links-loading-more');
- DOMHelpers.removeElement(linksLoadingMore);
- if(!links.length)
- return;
- }
-
- displayLinks(links, query);
- // Ensure footer can be reached
- DOMHelpers.scrollIfTallerThanFractionOfViewport(".col-links", 0.9);
-
- // If we received exactly `requestCount` number of links, there may be more to fetch from the server.
- // Set a waypoint event to trigger when the last link comes into view.
- if(links.length === requestCount){
- requestData.offset += requestCount;
- $linkTable.find('.item-container:last').waypoint(function(direction) {
- if (direction == 'down'){
- this.destroy(); // cancel waypoint
- $linkTable.append('
Loading more ...
');
- getNextContents();
- }
- }, {
- offset:'100%', // trigger waypoint when element hits bottom of window,
- context: '.col-links'
- });
- }
- });
- }
- getNextContents();
-}
-
-function displayLinks(links, query) {
- let template = linkTemplate({links: links, query: query});
- $linkTable.append(template);
- $('.toggle-details, .item-row._isDraggable').click(function(e){
- e.stopPropagation();
- toggleLinkDetails(e);
- });
-}
-
-function handleMouseDown (e) {
- if ($(e.target).hasClass('no-drag'))
- return;
-
- $.vakata.dnd.start(e, {
- jstree: true,
- obj: $(e.currentTarget),
- nodes: [
- {id: $(e.currentTarget).data('link_id')}
- ]
- }, '
[link]
');
-
- // record drag start position so we can check how far we were dragged on mouseup
- dragStartPosition = [e.pageX || e.originalEvent.touches[0].pageX, e.pageY || e.originalEvent.touches[0].pageY];
-}
-
-function handleMouseUp (e) {
- // prevent JSTree's tap-to-drag behavior
- $.vakata.dnd.stop(e);
-
- // don't treat this as a click if the mouse has moved more than 5 pixels -- it's probably an aborted drag'n'drop or touch scroll
- if(dragStartPosition && Math.sqrt(Math.pow(e.pageX-dragStartPosition[0], 2)*Math.pow(e.pageY-dragStartPosition[1], 2))>5)
- return;
-
- // don't toggle faster than twice a second (in case we get both mouseup and touchend events)
- if(new Date().getTime() - lastRowToggleTime < 500)
- return;
- lastRowToggleTime = new Date().getTime();
-}
-
-let getLinkContainer = function(elem) {
- return $(elem).closest('.item-container');
-};
-
-let toggleLinkDetails = function(e) {
- if (e.target.tagName == 'A' && e.target.classList.contains('no-drag')) {
- // Don't toggle details if the user has clicked on the Perma Link URL,
- // the original URL, or the delete button
- return
- }
-
- let linkContainer = getLinkContainer(e.target),
- details = linkContainer.find('.item-details');
- if (details.is(':visible')) {
- hideLinkDetails(linkContainer, details);
- } else {
- showLinkDetails(linkContainer, details);
- }
-};
-
-let hideLinkDetails = function (linkContainer, details) {
- linkContainer.find('.collapse-details').blur().hide();
- linkContainer.find('.expand-details').show().focus();
- details.hide();
- linkContainer.toggleClass( '_active' );
-};
-
-let showLinkDetails = function (linkContainer, details) {
- // when showing link details, update the move-to-folder select input
- // based on the current folderTree structure
-
- // first clear the select ...
- let currentFolderID = selectedFolderID,
- moveSelect = details.find('.move-to-folder');
- FolderSelectorHelper.makeFolderSelector(moveSelect, currentFolderID);
- details.show();
- linkContainer.toggleClass('_active');
- linkContainer.find('.expand-details').blur().hide();
- linkContainer.find('.collapse-details').show().focus();
-};
diff --git a/perma_web/static/js/modals.module.js b/perma_web/static/js/modals.module.js
deleted file mode 100644
index eb81de2c6..000000000
--- a/perma_web/static/js/modals.module.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// From https://github.com/harvard-lil/accessibility-tools/blob/master/code/modals/
-
-// For this library to work:
-// All non-modal content should be enclosed in a div id="after-modals"
-
-let $modals;
-let $focusOnClose;
-
-export function returnFocusTo(elem){
- $focusOnClose = elem;
-}
-
-function setup_handlers() {
-
- // add aria-hidden to all non-modal content, when the modal is open
- $modals.on('show.bs.modal', function (e) {
- $('#after-modals').attr('aria-hidden', true);
- })
- $modals.on('hide.bs.modal', function (e) {
- $('#after-modals').attr('aria-hidden', false);
- })
- $modals.on('hidden.bs.modal', function (e) {
- $focusOnClose.focus();
- $focusOnClose = null;
- })
-}
-
-export function init() {
- $(function() {
- $modals = $('.modal');
- setup_handlers();
- });
-}
-
diff --git a/perma_web/webpack-stats.json b/perma_web/webpack-stats.json
index f6c62821a..10ad2bcc4 100644
--- a/perma_web/webpack-stats.json
+++ b/perma_web/webpack-stats.json
@@ -93,22 +93,6 @@
"name": "cb3625efa7f7697e0609b1ee54353306.eot",
"path": "/perma/perma_web/static/bundles/cb3625efa7f7697e0609b1ee54353306.eot"
},
- "create.css": {
- "name": "create.css",
- "path": "/perma/perma_web/static/bundles/create.css"
- },
- "create.css.map": {
- "name": "create.css.map",
- "path": "/perma/perma_web/static/bundles/create.css.map"
- },
- "create.js": {
- "name": "create.js",
- "path": "/perma/perma_web/static/bundles/create.js"
- },
- "create.js.map": {
- "name": "create.js.map",
- "path": "/perma/perma_web/static/bundles/create.js.map"
- },
"d8472f7b6012706fc028021e5a654843.ttf": {
"name": "d8472f7b6012706fc028021e5a654843.ttf",
"path": "/perma/perma_web/static/bundles/d8472f7b6012706fc028021e5a654843.ttf"
@@ -203,12 +187,6 @@
"admin-stats.js",
"admin-stats.js.map"
],
- "create": [
- "create.css",
- "create.js",
- "create.css.map",
- "create.js.map"
- ],
"dashboard": [
"dashboard.css",
"dashboard.js",
@@ -239,5 +217,7 @@
"single-link-permissions.js",
"single-link-permissions.js.map"
]
- }
+ },
+ "error": "ModuleNotFoundError",
+ "message": "Module not found: Error: Can't resolve '../../static/js/helpers/api.module.js' in '/perma/perma_web/static/frontend/components'"
}
\ No newline at end of file
diff --git a/perma_web/webpack.config.js b/perma_web/webpack.config.js
index 75c3cafe9..016962a4d 100644
--- a/perma_web/webpack.config.js
+++ b/perma_web/webpack.config.js
@@ -22,14 +22,13 @@ module.exports = {
],
// each of these entry points will also include global.js, so should be listed in CommonsChunkPlugin below
- 'create': './static/js/create',
'single-link-permissions': './static/js/single-link-permissions.module',
'link-delete-confirm': './static/js/link-delete-confirm',
'developer-docs': './static/js/developer-docs',
'admin-stats': './static/js/admin-stats',
// for the new Vue frontend
- 'dashboard': './frontend/pages/dashboard.js',
+ 'dashboard': './static/frontend/pages/dashboard.js',
},
output: {
@@ -85,18 +84,6 @@ module.exports = {
}
},
- // handlebars template
- {
- test: /\.handlebars$/,
- loader: 'handlebars-loader',
- options: {
- runtime: 'handlebars/dist/handlebars.min.js',
- helperDirs: [
- __dirname + "/static/js/hbs/helpers",
- ]
- }
- },
-
// Vue stuff
{
test: /\.vue$/,