-
- • {waitingCount} Files(s) Processing
- {`✓ ${importedCount} File(s) ${
- this.withPdf ? 'Generated' : 'Imported'
- }`}
- x {failedCount} File(s) Failed
-
-
-
+
+
+
{waitingCount} Files(s) Processing
+
{`${importedCount} File(s) ${this.withPdf ? 'Generated' : 'Imported'}`}
+
{failedCount} File(s) Failed
+
+
);
}
}
ImportStatus.propTypes = {
- jobs: PropTypes.object,
+ jobs: PropTypes.object.isRequired,
links: PropTypes.array,
- type: PropTypes.string,
- path: PropTypes.string,
+ type: PropTypes.string.isRequired,
+ polling_path: PropTypes.string.isRequired,
+ pollingPath: PropTypes.string.isRequired,
+ pollingInterval: PropTypes.number,
+ polling_interval: PropTypes.number,
with_pdf: PropTypes.bool,
+ withPdf: PropTypes.bool,
};
export default ImportStatus;
diff --git a/app/javascript/components/admin/Initializer.jsx b/app/javascript/components/admin/Initializer.jsx
index f048eb52..23206443 100644
--- a/app/javascript/components/admin/Initializer.jsx
+++ b/app/javascript/components/admin/Initializer.jsx
@@ -1,20 +1,47 @@
-const Initializer = {
- initializeResourcesForm: () => {
- const form = $('form#resource_form');
- if (!form.length) return;
+import $ from 'jquery';
+import CurriculumEditor from './curriculum/CurriculumEditor';
+import ImportStatus from './ImportStatus';
+import MultiSelectedOperation from './MultiSelectedOperation';
+import React from 'react';
+import ReactDOM from 'react-dom';
- const opr_desc = form.find('.resource_opr_description');
- form.find('#resource_curriculum_type').change(ev => {
- const el = $(ev.target);
- if (el.val() === 'unit') {
- opr_desc.slideDown();
- } else {
- opr_desc.slideUp();
- }
+class Initializer {
+ static initialize() {
+ // Mount internal components
+ Initializer.#initializeCurriculumEditor();
+ Initializer.#InitializeImportStatus();
+ Initializer.#initializeMultiSelectedOperation();
+
+ // Initialize simple HTML objects
+ Initializer.#initializeResourcesList();
+ Initializer.#initializeSelectAll();
+ }
+
+ static #initializeCurriculumEditor() {
+ document.querySelectorAll('[id="#lcms-engine-CurriculumEditor"]').forEach(e => {
+ const props = JSON.parse(e.dataset.content);
+ e.removeAttribute('data-content');
+ ReactDOM.render(
, e);
+ });
+ }
+
+ static #InitializeImportStatus() {
+ document.querySelectorAll('[id="#lcms-engine-ImportStatus"]').forEach(e => {
+ const props = JSON.parse(e.dataset.content);
+ e.removeAttribute('data-content');
+ ReactDOM.render(
, e);
+ });
+ }
+
+ static #initializeMultiSelectedOperation() {
+ document.querySelectorAll('[id="#lcms-engine-MultiSelectedOperation"]').forEach(e => {
+ const props = JSON.parse(e.dataset.content);
+ e.removeAttribute('data-content');
+ ReactDOM.render(
, e);
});
- },
+ }
- initializeResourcesList: () => {
+ static #initializeResourcesList() {
const page = $('.o-adm-list.o-adm-documents');
if (!page.length) return;
@@ -22,9 +49,9 @@ const Initializer = {
const value = $(this).prop('checked') ? 1 : 0;
page.find('.c-reimport-doc-form .c-reimport-with-materials__field').val(value);
});
- },
+ }
- initializeSelectAll: () => {
+ static #initializeSelectAll() {
const selector = $('.c-multi-selected--select-all');
if (!selector.length) return;
@@ -33,7 +60,7 @@ const Initializer = {
const checked = el.prop('checked');
$('.table input[type=checkbox][name="selected_ids[]"]').prop('checked', checked);
});
- },
-};
+ }
+}
export default Initializer;
diff --git a/app/javascript/components/admin/MultiSelectedOperation.jsx b/app/javascript/components/admin/MultiSelectedOperation.jsx
index f82a1be7..026fdb06 100644
--- a/app/javascript/components/admin/MultiSelectedOperation.jsx
+++ b/app/javascript/components/admin/MultiSelectedOperation.jsx
@@ -1,3 +1,4 @@
+import $ from 'jquery';
import React from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
@@ -13,13 +14,13 @@ class MultiSelectedOperation extends React.Component {
componentDidMount() {
// eslint-disable-next-line react/no-find-dom-node
const $this = $(ReactDOM.findDOMNode(this));
- $this.parent().addClass('c-multi-selected-btn');
+ $this.parent().addClass(`c-multi-selected-btn ${this.props.wrapperClass}`);
}
onSubmit(evt) {
if (this.props.operation === 'delete' && !confirm('Are you sure?')) return; // eslint-disable-line no-restricted-globals
- const entries = $('.o-page .table input[name="selected_ids[]"]');
+ const entries = $('.table input[name="selected_ids[]"]');
const ids = _.filter(entries, e => e.checked).map(e => e.value);
if (ids.length === 0) return evt.preventDefault();
@@ -29,7 +30,7 @@ class MultiSelectedOperation extends React.Component {
}
render() {
- const btnClass = `button ${this.props.btn_style}`;
+ const btnClass = `btn ${this.props.btnStyle}`;
const method = this.props.operation === 'delete' ? 'delete' : 'post';
const csrf_token = $('meta[name=csrf-token]').attr('content');
return (
@@ -42,6 +43,7 @@ class MultiSelectedOperation extends React.Component {
method="post"
className="c-reimport-doc-form"
onSubmit={this.onSubmit}
+ data-turbo={false}
>
@@ -56,7 +58,8 @@ class MultiSelectedOperation extends React.Component {
MultiSelectedOperation.propTypes = {
operation: PropTypes.string,
- btn_style: PropTypes.string,
+ btnStyle: PropTypes.string,
+ wrapperClass: PropTypes.string,
path: PropTypes.string,
text: PropTypes.string,
};
diff --git a/app/javascript/components/admin/association-picker/AssociationPicker.jsx b/app/javascript/components/admin/association-picker/AssociationPicker.jsx
deleted file mode 100644
index 8f7a7851..00000000
--- a/app/javascript/components/admin/association-picker/AssociationPicker.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import _ from 'lodash';
-// eslint-disable-next-line no-unused-vars
-import AssociationPickerItem from './AssociationPickerItem';
-import AssociationPickerWindow from './AssociationPickerWindow';
-// eslint-disable-next-line no-unused-vars
-import PickerButton from '../picker/PickerButton';
-import pickerModal from '../picker/pickerModal';
-import pickerWindowWrapper from '../picker/pickerWindowWrapper';
-import { Foundation } from 'foundation-sites';
-import $ from 'jquery';
-
-class AssociationPicker extends React.Component {
- constructor(props) {
- super(props);
-
- this.state = {
- items: this.props.items || [],
- };
- }
-
- get jqmodal() {
- return $(this.modal);
- }
-
- componentDidMount() {
- Foundation.addToJquery($);
- // eslint-disable-next-line no-undef
- pickerModal.call(this);
- }
-
- onClickSelect() {
- // eslint-disable-next-line no-undef
- const pickerComponent = pickerWindowWrapper(AssociationPickerWindow, 'lcms_engine_admin_association_picker_path');
- const picker = React.createElement(
- pickerComponent,
- {
- association: this.props.association,
- allowCreate: this.props.allow_create,
- allowMultiple: this.props.allow_multiple,
- onClickDone: this.closeModal.bind(this),
- onSelectItem: this.selectItem.bind(this),
- selectedItems: this.state.items,
- },
- null
- );
- ReactDOM.render(picker, this.modal);
- this.jqmodal.foundation('open');
- }
-
- selectItem(item, operation) {
- if (!this.props.allow_multiple) {
- this.closeModal();
- }
- operation === 'added' ? this.addItem(item) : this.removeItem(item);
- }
-
- closeModal() {
- this.jqmodal.foundation('close');
- }
-
- addItem(item) {
- const newItems = this.props.allow_multiple ? [...this.state.items, item] : [item];
-
- this.setState({
- ...this.state,
- items: newItems,
- });
- }
-
- removeItem(item) {
- this.setState({
- ...this.state,
- items: _.filter(this.state.items, r => r.id !== item.id),
- });
- }
-
- render() {
- const items = this.state.items.map(item => {
- return (
-
this.removeItem(item)}
- />
- );
- });
-
- const blankInput = this.props.allow_multiple ? (
-
- ) : (
-
- );
-
- return (
- (this.modal = m)}
- />
- );
- }
-}
-
-AssociationPicker.propTypes = {
- item: PropTypes.object,
- items: PropTypes.array,
- association: PropTypes.string,
- create_name: PropTypes.string,
- allow_create: PropTypes.bool,
- allow_multiple: PropTypes.bool,
- name: PropTypes.string,
-};
-
-export default AssociationPicker;
diff --git a/app/javascript/components/admin/association-picker/AssociationPickerItem.jsx b/app/javascript/components/admin/association-picker/AssociationPickerItem.jsx
deleted file mode 100644
index fe6f7a36..00000000
--- a/app/javascript/components/admin/association-picker/AssociationPickerItem.jsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-// eslint-disable-next-line no-unused-vars
-function AssociationPickerItem(props) {
- let input;
-
- if (props.item._create) {
- input = ;
- } else if (props.allowMultiple) {
- input = ;
- } else {
- input = ;
- }
-
- return (
-
- {input}
-
- {props.item.name}
-
- ×
-
-
-
- | props.onSelectItem(newItem)}>
- {props.value}
- (Create)
- |
-
,
- /* eslint-enable react/jsx-no-bind */
- ];
- } else {
- items = props.items.map(item => {
- let newItem = {
- id: item.id,
- name: item.name,
- _create: false,
- _selected: isSelected(item),
- };
- return (
- /* eslint-disable react/jsx-no-bind */
-
- | props.onSelectItem(newItem)}>{newItem.name} |
-
- /* eslint-enable react/jsx-no-bind */
- );
- });
- }
-
- return (
-
-
-
- | Name |
-
-
-
- {items.length ? (
- items
- ) : (
-
- | Nothing to select |
-
- )}
-
-
- );
-}
-
-AssociationPickerResults.propTypes = {
- value: PropTypes.string,
- allowCreate: PropTypes.bool,
- items: PropTypes.array,
- selectedItems: PropTypes.array,
- onSelectItem: PropTypes.func,
-};
-
-export default AssociationPickerResults;
diff --git a/app/javascript/components/admin/association-picker/AssociationPickerWindow.jsx b/app/javascript/components/admin/association-picker/AssociationPickerWindow.jsx
deleted file mode 100644
index 1452b3e9..00000000
--- a/app/javascript/components/admin/association-picker/AssociationPickerWindow.jsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import React from 'react';
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import AssociationPickerResults from './AssociationPickerResults';
-
-class AssociationPickerWindow extends React.Component {
- constructor(props) {
- super(props);
-
- this.state = { ...props, selectedItems: [] };
-
- this.selectItem = this.selectItem.bind(this);
- }
-
- selectItem(item) {
- const operation = this.updateSelectedItems(item);
- if ('onSelectItem' in this.props) {
- this.props.onSelectItem(item, operation);
- }
- }
-
- updateSelectedItems(item) {
- let operation, newItems;
- if (item._selected) {
- newItems = _.filter(this.state.selectedItems, r => r.id !== item.id);
- operation = 'removed';
- } else {
- newItems = [...this.state.selectedItems, item];
- operation = 'added';
- }
- this.setState(...this.state, { selectedItems: newItems });
- return operation;
- }
-
- render() {
- const { q, results } = this.props;
-
- return (
-
-
-
-
Select item
-
-
-
-
-
-
-
-
-
-
- {this.props.pagination()}
-
- {this.props.allowMultiple ? (
-
- ) : null}
-
-
-
(Click on a node with the right button to add/edit/remove)
diff --git a/app/javascript/components/admin/curriculum/DirectoryPicker.jsx b/app/javascript/components/admin/curriculum/DirectoryPicker.jsx
deleted file mode 100644
index 4e5a71fb..00000000
--- a/app/javascript/components/admin/curriculum/DirectoryPicker.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import { Foundation } from 'foundation-sites';
-import TagsInput from 'react-tagsinput';
-import $ from 'jquery';
-import '../../../vendor/jstree/jstree.min';
-
-class DirectoryPicker extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- directory: props.directory,
- parent: props.parent,
- };
-
- this.onClick = this.onClick.bind(this);
- this.handleDirChange = this.handleDirChange.bind(this);
- }
-
- componentDidMount() {
- // eslint-disable-next-line react/no-find-dom-node
- const $this = $(ReactDOM.findDOMNode(this));
- $this.parent().addClass('o-curriculum-tree-picker__container');
-
- const editor = $this.find('#curriculum-tree-picker');
- editor.on('changed.jstree', this.onChanged.bind(this)).jstree({
- core: {
- animation: 0,
- themes: { dots: true },
- check_callback: true,
- data: {
- url: this.props.path,
- data: node => {
- return { id: node.id };
- },
- },
- },
- plugins: ['wholerow', 'changed'],
- });
- this.jsTree = editor.data('jstree');
-
- Foundation.addToJquery($);
- this.jqmodal = $this.find('#curriculum-picker-modal');
- new Foundation.Reveal(this.jqmodal, null);
- }
-
- closeModal() {
- this.jqmodal.foundation('close');
- }
-
- onChanged(_e, data) {
- const dir = this.directory(data.node);
- const parent = {
- id: data.node.id,
- title: data.node.li_attr.title,
- directory: dir,
- };
- this.setState({ directory: dir, parent: parent });
- this.closeModal();
- }
-
- onClick(e) {
- e.preventDefault();
- this.jqmodal.foundation('open');
- }
-
- directory(node) {
- return node.parents
- .map(el => this.jsTree.get_node(el, null).text)
- .reverse()
- .slice(1)
- .concat(node.text);
- }
-
- handleDirChange(tags) {
- this.setState({ directory: tags });
- }
-
- render() {
- const curr = this.state.parent.directory;
- const parent_aside = curr.length > 0 ? `(${curr.join(' | ')}) : ` : '';
- return (
-
-
-
-
- {/* eslint-disable jsx-a11y/anchor-is-valid */}
-
- Select Parent
-
- {/* eslint-enable jsx-a11y/anchor-is-valid */}
-
-
{this.state.parent.title}
-
-
-
-
-
-
-
-
-
Select a Parent Resource
-
-
-
-
-
- {props.hiddenInputs}
- {props.content}
-
-
-
-
-
- );
- }
- };
-}
-
-export default pickerWindowWrapper;
diff --git a/app/javascript/components/admin/resource-picker/ResourcePicker.jsx b/app/javascript/components/admin/resource-picker/ResourcePicker.jsx
deleted file mode 100644
index 0a9ac91f..00000000
--- a/app/javascript/components/admin/resource-picker/ResourcePicker.jsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import _ from 'lodash';
-import ResourcePickerWindow from './ResourcePickerWindow';
-import ResourcePickerResource from './ResourcePickerResource';
-import PickerButton from '../picker/PickerButton';
-import pickerWindowWrapper from '../picker/pickerWindowWrapper';
-import pickerModal from '../picker/pickerModal';
-import { Foundation } from 'foundation-sites';
-import $ from 'jquery';
-
-class ResourcePicker extends React.Component {
- constructor(props) {
- super(props);
-
- const resources = 'resources' in props ? props.resources : [];
-
- this.state = {
- resources: resources,
- };
- }
-
- get jqmodal() {
- return $(this.modal);
- }
-
- get allowMultiple() {
- if (_.isUndefined(this.props.allow_multiple) || this.props.allow_multiple === null) {
- return true;
- }
- return this.props.allow_multiple;
- }
-
- componentDidMount() {
- Foundation.addToJquery($);
- // eslint-disable-next-line no-undef
- pickerModal.call(this);
- }
-
- onClickSelect() {
- // eslint-disable-next-line no-undef
- const pickerComponent = pickerWindowWrapper(ResourcePickerWindow, 'lcms_engine_admin_resource_picker_path');
- const picker = React.createElement(
- pickerComponent,
- {
- onSelectResource: this.selectResource.bind(this),
- },
- null
- );
- ReactDOM.render(picker, this.modal);
- this.jqmodal.foundation('open');
- }
-
- selectResource(resource) {
- this.jqmodal.foundation('close');
-
- const newResources = this.allowMultiple ? [...this.state.resources, resource] : [resource];
-
- this.setState({
- ...this.state,
- resources: newResources,
- });
- }
-
- removeResource(resource) {
- this.setState({
- ...this.state,
- resources: _.filter(this.state.resources, r => r.id !== resource.id),
- });
- }
-
- render() {
- const resources = this.state.resources.map(resource => {
- return (
- this.removeResource(resource)}
- />
- );
- });
-
- const input = ;
-
- return (
- (this.modal = m)}
- />
- );
- }
-}
-
-ResourcePicker.propTypes = {
- name: PropTypes.string,
- resources: PropTypes.array,
- allow_multiple: PropTypes.bool,
-};
-
-export default ResourcePicker;
diff --git a/app/javascript/components/admin/resource-picker/ResourcePickerResource.jsx b/app/javascript/components/admin/resource-picker/ResourcePickerResource.jsx
deleted file mode 100644
index c5a134c0..00000000
--- a/app/javascript/components/admin/resource-picker/ResourcePickerResource.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-function ResourcePickerResource(props) {
- return (
-
-
-
- {props.resource.title}
-
- ×
-
-
-
-
-
-
Select resource
-
- {this.filterElement('Curriculum Type', type, 'type', this.typeOptions)}
- {this.filterElement('Subject', subject, 'subject', this.subjectOptions)}
- {this.filterElement('Grade', grade, 'grade', this.gradeOptions)}
-
-
-
-
-
-
-
-
-
-
-
- | Title |
-
-
-
- {this.props.results.map(resource => (
-
- {/*
- eslint-disable react/jsx-no-bind
- */}
- | {resource.title} |
-
- ))}
-
-
-
- {this.props.pagination()}
-
-
-
@@ -380,7 +382,7 @@ def remove_spans_wo_attrs(env)
def remove_empty_paragraphs(env)
node = env[:node]
- node.unlink if node.element? && (node.name == 'p' || node.name == 'span') && node.inner_html.squish.blank?
+ node.unlink if node.element? && %w(p span).include?(node.name) && node.inner_html.squish.blank?
end
# replace inline borders style with width = 0 as they're not processing correct for pdf
diff --git a/app/services/lcms/engine/import_service.rb b/app/services/lcms/engine/import_service.rb
new file mode 100644
index 00000000..7bb93168
--- /dev/null
+++ b/app/services/lcms/engine/import_service.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Lcms
+ module Engine
+ class ImportService
+ #
+ # @param [String] url
+ # @return [String]
+ #
+ def self.call(url)
+ google_credentials = Lt::Google::Api::Auth::Cli.new.credentials
+ downloader = Lt::Lcms::Lesson::Downloader::Base.new google_credentials, url
+ downloader.download(mime_type: 'text/csv').content
+ end
+ end
+ end
+end
diff --git a/app/services/lcms/engine/material_build_service.rb b/app/services/lcms/engine/material_build_service.rb
index a48743f9..30ff9bb0 100644
--- a/app/services/lcms/engine/material_build_service.rb
+++ b/app/services/lcms/engine/material_build_service.rb
@@ -7,7 +7,7 @@ module Lcms
module Engine
class MaterialBuildService
EVENT_BUILT = 'material:built'
- PDF_EXT_RE = /\.pdf$/.freeze
+ PDF_EXT_RE = /\.pdf$/
attr_reader :errors
@@ -34,11 +34,11 @@ def build_from_pdf # rubocop:disable Metrics/AbcSize
title = @downloader.file.name.sub(PDF_EXT_RE, '')
identifier = "#{title.downcase}#{ContentPresenter::PDF_EXT}"
- metadata = DocTemplate::Objects::MaterialMetadata.build_from_pdf(identifier: identifier, title: title).as_json
+ metadata = DocTemplate::Objects::MaterialMetadata.build_from_pdf(identifier:, title:).as_json
material.update!(
material_params.merge(
- identifier: identifier,
- metadata: metadata
+ identifier:,
+ metadata:
)
)
@@ -63,7 +63,7 @@ def build_from_gdoc
create_material
content = @downloader.download.content
template = DocTemplate::Template.parse(content, type: :material)
- @errors = template.metadata_service.errors
+ @errors = template.metadata_service.errors + template.documents.values.flat_map(&:errors)
metadata = template.metadata_service.options_for(:default)[:metadata]
material.update!(
diff --git a/app/services/lcms/engine/material_preview_generator.rb b/app/services/lcms/engine/material_preview_generator.rb
index 345fa1c8..f3984e9e 100644
--- a/app/services/lcms/engine/material_preview_generator.rb
+++ b/app/services/lcms/engine/material_preview_generator.rb
@@ -6,8 +6,8 @@ module Engine
# Generates and uploads PDF/GDoc files for material
#
class MaterialPreviewGenerator
- GDOC_RE = %r{docs.google.com/document/d/([^/]*)}i.freeze
- GDOC_BROKEN_RE = %r{/open\?id=$}i.freeze
+ GDOC_RE = %r{docs.google.com/document/d/([^/]*)}i
+ GDOC_BROKEN_RE = %r{/open\?id=$}i
PDF_S3_FOLDER = 'temp-materials-pdf'
attr_reader :error, :url
@@ -30,7 +30,7 @@ def perform
attr_reader :material, :options
- def assign_document
+ def assign_document # rubocop:disable Naming/PredicateMethod
document = material.documents.last || Document.last
unless document.present?
@error = "Can't generate PDF for preview: no documents exist"
@@ -45,14 +45,14 @@ def generate_gdoc
folder_id = options[:folder_id]
file_id = material.preview_links['gdoc'].to_s.match(GDOC_RE)&.[](1)
@url = DocumentExporter::Gdoc::Material.new(material)
- .export_to(folder_id, file_id: file_id)
+ .export_to(folder_id, file_id:)
.url
return true if @url !~ GDOC_BROKEN_RE
raise 'GDoc generation failed. Please try again later'
end
- def generate_pdf
+ def generate_pdf # rubocop:disable Naming/PredicateMethod
pdf_filename = "#{PDF_S3_FOLDER}/#{material.id}/#{material.base_filename}#{ContentPresenter::PDF_EXT}"
pdf = DocumentExporter::Pdf::Material.new(material).export
@url = S3Service.upload pdf_filename, pdf
diff --git a/app/services/lcms/engine/react_materials_resolver.rb b/app/services/lcms/engine/react_materials_resolver.rb
index 7724a644..c6b114e5 100644
--- a/app/services/lcms/engine/react_materials_resolver.rb
+++ b/app/services/lcms/engine/react_materials_resolver.rb
@@ -23,7 +23,7 @@ def replace_react(node, document) # rubocop:disable Metrics/PerceivedComplexity
else
JSON.parse(data)
end
- node.remove && return if (raw_props['material_ids']).empty?
+ node.remove && return if raw_props['material_ids'].empty?
props = PreviewsMaterialSerializer.new(raw_props, document)
node.remove && return if props.data && props.data.empty?
diff --git a/app/services/lcms/engine/related_instructions_service.rb b/app/services/lcms/engine/related_instructions_service.rb
deleted file mode 100644
index 4d13c597..00000000
--- a/app/services/lcms/engine/related_instructions_service.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Lcms
- module Engine
- class RelatedInstructionsService
- attr_reader :resource, :expanded, :has_more, :instructions
-
- def initialize(resource, expanded)
- @resource = resource
- @expanded = expanded
-
- find_related_instructions
- end
-
- private
-
- def find_related_instructions
- instructions = expanded ? expanded_instructions : colapsed_instructions
-
- @has_more = true if videos.size > instructions.size
- @instructions = instructions.map do |inst|
- ResourceInstructionSerializer.new(inst)
- end
- end
-
- def expanded_instructions
- videos
- end
-
- def colapsed_instructions
- # show 4 videos
- videos[0...4]
- end
-
- def videos
- @videos ||= find_related_through_standards(limit: 4) do |standard|
- standard.resources.media.distinct
- end
- end
-
- def find_related_through_standards(limit:, &_block)
- related = resource.standards.flat_map do |standard|
- qset = yield standard
- qset = qset.limit(limit) unless expanded # limit each part
- qset
- end.uniq
-
- if expanded
- related
- else
- @has_more = true if related.count > limit
- related[0...limit] # limit total
- end
- end
- end
- end
-end
diff --git a/app/services/lcms/engine/s3_service.rb b/app/services/lcms/engine/s3_service.rb
index 979a428e..7cfe1165 100644
--- a/app/services/lcms/engine/s3_service.rb
+++ b/app/services/lcms/engine/s3_service.rb
@@ -12,6 +12,43 @@ def self.create_object(key)
.object(key)
end
+ # Reads data from an S3 object specified by the given URI.
+ #
+ # @param uri [URI] The URI of the S3 object. The URI should include the bucket name in the host
+ # and the object key in the path.
+ # @return [String] The content of the S3 object as a string.
+ #
+ # @raise [RuntimeError] If the S3 object is not found or if there is a service error.
+ # @raise [Aws::S3::Errors::NoSuchKey] If the specified key does not exist in the bucket.
+ # @raise [Aws::S3::Errors::ServiceError] If there is an error with the S3 service.
+ # @raise [StandardError] For any other unexpected errors.
+ #
+ def self.read_data_from_s3(uri)
+ # Extract bucket and key from the URL
+ bucket = uri.host.split('.').first
+ key = URI.decode_www_form_component(uri.path[1..]) # Decode URL-encoded characters
+
+ # Initialize the S3 client
+ s3_client = Aws::S3::Client.new(
+ region: ENV.fetch('AWS_REGION', 'us-east-1'),
+ access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID', nil),
+ secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', nil)
+ )
+
+ # Fetch the object from S3
+ response = s3_client.get_object(bucket:, key:)
+ response.body.read
+ rescue Aws::S3::Errors::NoSuchKey => e
+ Rails.logger.error "S3 Error: Object not found - #{e.message}"
+ raise "S3 object not found: #{key}"
+ rescue Aws::S3::Errors::ServiceError => e
+ Rails.logger.error "S3 Service Error: #{e.message}"
+ raise "S3 service error: #{e.message}"
+ rescue StandardError => e
+ Rails.logger.error "Unexpected error while fetching S3 object: #{e.message}"
+ raise "Unexpected error: #{e.message}"
+ end
+
#
# Upload data to the specified resource by key
#
@@ -24,7 +61,8 @@ def self.create_object(key)
def self.upload(key, data, options = {})
object = create_object key
options = options.merge(
- body: data
+ body: data,
+ cache_control: 'public, max-age=0, must-revalidate'
)
object.put(options)
object.public_url
diff --git a/app/services/lcms/engine/sketch_compiler.rb b/app/services/lcms/engine/sketch_compiler.rb
deleted file mode 100644
index a96ca447..00000000
--- a/app/services/lcms/engine/sketch_compiler.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'base64'
-
-module Lcms
- module Engine
- class SketchCompiler
- def initialize(user_id, user_ip, version)
- @user_id = user_id
- @user_ip = user_ip
- @version = version
- end
-
- #
- # Returns HTTParty::Response object
- #
- def compile(core_url, foundational_url)
- api_url = ENV.fetch('UB_COMPONENTS_API_URL')
- url = [api_url, @version, 'compile'].join('/')
- post_params = {
- body: {
- uid: Base64.encode64("#{@user_id}@#{@user_ip}"),
- url: core_url,
- foundational_url: foundational_url
- },
- headers: { 'Authorization' => %(Token token="#{ENV.fetch 'UB_COMPONENTS_API_TOKEN'}") },
- timeout: 5 * 60
- }
- HTTParty.post url, post_params
- end
- end
- end
-end
diff --git a/app/services/lcms/engine/standards_import_service.rb b/app/services/lcms/engine/standards_import_service.rb
new file mode 100644
index 00000000..acbdf4cc
--- /dev/null
+++ b/app/services/lcms/engine/standards_import_service.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Lcms
+ module Engine
+ class StandardsImportService < ImportService
+ class << self
+ #
+ # @param [String] url
+ #
+ def call(url)
+ ActiveRecord::Base.transaction do
+ Lcms::Engine::Standard.destroy_all
+ CSV.parse(super, headers: true, &method(:create_from_csv_row))
+ end
+ after_reimport_hook
+ end
+
+ def after_reimport_hook; end
+
+ private
+
+ #
+ # @param [Array]
+ #
+ def create_from_csv_row(_row)
+ raise NotImplementedError
+ end
+ end
+ end
+ end
+end
diff --git a/app/uploaders/download_uploader.rb b/app/uploaders/download_uploader.rb
deleted file mode 100644
index 2806fa4a..00000000
--- a/app/uploaders/download_uploader.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class DownloadUploader < CarrierWave::Uploader::Base
- def store_dir
- "attachments/#{model.id}"
- end
-
- def fog_attributes
- { 'Content-Disposition' => 'attachment' }
- end
-end
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 0dba595d..670d177e 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,4 +1,4 @@
-
+
Resend confirmation instructions
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index c9f20fb0..5f6c08d0 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,4 +1,4 @@
-
+
Change your password
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index e466090f..9a2382a1 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,4 +1,4 @@
-
+
Forgot your password?
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index ba2d2f64..96946b19 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -37,7 +37,7 @@
Cancel my account
-
Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>
+
Unhappy? <%= button_to 'Cancel my account', registration_path(resource_name), data: { confirm: 'Are you sure?', 'turbo-method': :delete }, method: :delete %>
<%= link_to "Back", :back %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 1dfc3fe7..7ebe6c45 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,4 +1,4 @@
-
+
Register
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 5936fbb9..8e6e4d2d 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,29 +1,28 @@
-<% content_for :above_flash do %>
-
- Welcome to <%= ENV['APP_NAME'] %>!
-
-<% end %>
-
-
-
-
-
Log in
-
+
+
+
Login
- <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.email_field :email, autofocus: true, class: 'o-input-placehoder--medium-gray', placeholder: 'Enter email address' %>
- <%= f.password_field :password, autocomplete: 'off', class: 'o-input-placehoder--medium-gray', placeholder: 'Enter password' %>
-
- <%= f.submit 'Log in', class: 'button o-btn--xs-full warning o-btn--xs-full u-margin-right--base ' %>
- <%= link_to 'Register', new_registration_path(resource_name), class: 'button o-btn--xs-full o-btn--bordered-yellow u-color--base o-btn--xs-full' %>
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { 'data-turbo': 'false' }) do |f| %>
+
+ <%= f.email_field :email, autofocus: true, class: 'form-control', placeholder: 'Enter email address', id: 'email-field' %>
+
+
+ <%= f.password_field :password, autocomplete: 'off', class: 'form-control', placeholder: 'Enter password', id: 'password-field' %>
+
+
+
+ <%= f.submit 'Log in', class: 'btn btn-primary btn-block mb-4' %>
+
+
+ <%= link_to 'Register', new_registration_path(resource_name), class: '' %>
- <% end %>
+
-
+
<%= link_to 'Forgot your password?', new_password_path(resource_name) %>
<%= link_to "Didn't receive confirmation instructions?", new_user_confirmation_path %>
-
+ <% end %>
diff --git a/app/views/layouts/lcms/engine/admin.html.erb b/app/views/layouts/lcms/engine/admin.html.erb
index 76537551..54356179 100644
--- a/app/views/layouts/lcms/engine/admin.html.erb
+++ b/app/views/layouts/lcms/engine/admin.html.erb
@@ -4,24 +4,19 @@
<%= "#{t('ui.unbounded')} - #{page_title}" %>
-
- <%= render partial: 'lcms/engine/shared/favicon' %>
- <%= stylesheet_link_tag 'lcms/engine/lcms_engine_admin', media: 'all', 'data-turbolinks-track' => 'reload' %>
<%= csrf_meta_tags %>
- <%# NOTE: JS served via Assets pipeline should be added first %>
- <%= javascript_include_tag 'lcms/engine/admin/lcms_engine_application', 'data-turbolinks-track' => 'reload' %>
- <%= lcms_engine_javascript_pack_tag 'lcms_engine_admin' %>
+
+
+ <%= javascript_include_tag Ckeditor.cdn_url, "data-turbo-track": "reload", defer: true %>
-
- <%= render partial: 'lcms/engine/admin/shared/header' %>
-
- <%= render partial: 'lcms/engine/shared/flash' %>
- <%= yield %>
-
+ <%= render partial: 'lcms/engine/shared/header' %>
+ <%= render partial: 'lcms/engine/shared/flash' %>
+
+ <%= yield %>
- <%= render partial: 'lcms/engine/shared/footer' %>
+ <%#= render partial: 'lcms/engine/shared/footer' %>