Tidying up code and translations

Author: mbusch3

assets/js/Components/FixIssuesPage.js

@@ -809,9 +809,7 @@ export default function FixIssuesPage({
                   handleIssueSave={handleIssueSave}
                   isContentLoading={contentItemsBeingScanned.includes(tempActiveIssue?.issueData?.contentItemId)}
                   isErrorFoundInContent={isErrorFoundInContent}
-                  sessionIssues={sessionIssues}
                   setTempActiveIssue={setTempActiveIssue}
-                  severity={tempActiveIssue.severity}
                   tempActiveIssue={tempActiveIssue}
                   triggerLiveUpdate={triggerLiveUpdate}
                 />

assets/js/Components/Widgets/FileReviewPreview.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react'
+import React from 'react'
 import DownloadIcon from '../Icons/DownloadIcon'
 import ExternalLinkIcon from '../Icons/ExternalLinkIcon'
 import * as Text from '../../Services/Text'

assets/js/Components/Widgets/FixIssuesContentPreview.js

@@ -1,11 +1,9 @@
 import React, { useState, useEffect, useRef } from 'react'
-import FileReviewPreview from './FileReviewPreview'
 import ExternalLinkIcon from '../Icons/ExternalLinkIcon'
 import ProgressIcon from '../Icons/ProgressIcon'
 import InfoIcon from '../Icons/InfoIcon'
-import { formFromIssue, formNameFromRule, formNames } from '../../Services/Ufixit'
+import { formNameFromRule, formNames } from '../../Services/Ufixit'
 import * as Html from '../../Services/Html'
-import * as Text from '../../Services/Text'
 import UpArrowIcon from '../Icons/UpArrowIcon'
 import DownArrowIcon from '../Icons/DownArrowIcon'
 import './FixIssuesContentPreview.css'
@@ -290,21 +288,6 @@ export default function FixIssuesContentPreview({
     setTaggedContent(doc.innerHTML)
   }, [liveUpdateToggle])
 
-  const getReadableFileType = (fileType) => {
-    switch (fileType) {
-      case 'doc':
-        return t('label.mime.doc')
-      case 'ppt':
-        return t('label.mime.ppt')
-      case 'xls':
-        return t('label.mime.xls')
-      case 'pdf':
-        return t('label.mime.pdf')
-      default:
-        return t('label.mime.unknown')
-    }
-  }
-
   const scrollToElement = (element) => {
     if (element) {
       element.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'nearest' })

assets/js/Components/Widgets/FixIssuesFilters.js

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import SearchIcon from '../Icons/SearchIcon'
 import CloseIcon from '../Icons/CloseIcon'
-import ContentTypeIcon from '../Icons/ContentTypeIcon'
 import FilterOnIcon from '../Icons/FilterOnIcon'
 import FilterOffIcon from '../Icons/FilterOffIcon'
 import Combobox from '../Widgets/Combobox'

assets/js/Components/Widgets/ReviewFilesFilters.js

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import SearchIcon from '../Icons/SearchIcon'
 import CloseIcon from '../Icons/CloseIcon'
-import ContentTypeIcon from '../Icons/ContentTypeIcon'
 import FilterOnIcon from '../Icons/FilterOnIcon'
 import FilterOffIcon from '../Icons/FilterOffIcon'
 import Combobox from './Combobox'
@@ -23,7 +22,6 @@ export default function ReviewFilesFilters({
 
   const filterLabels = {
     [FILTER.TYPE.UTILIZATION]: t('filter.label.utilization'),
-    // [FILTER.TYPE.PUBLISHED]: t('filter.label.published'),
     [FILTER.TYPE.FILE_TYPE]: t('filter.label.file_type'),
     [FILTER.TYPE.RESOLUTION]: t('filter.label.resolution'),
     [FILTER.TYPE.MODULE]: t('filter.label.module'),
@@ -98,14 +96,10 @@ export default function ReviewFilesFilters({
     updateActiveFilters(filterType, FILTER.ALL)
   }
 
-  // TODO: Icons on the Content Type dropdown
-  // TODO: Cool-looking, yet fully accessible dropdown. Maybe like https://www.w3.org/WAI/ARIA/apg/patterns/combobox/examples/combobox-select-only/
-
   return (
     <div className="filter-container flex-column gap-1">
       <div className="flex-row justify-content-between">
         <div className="flex-column flex-shrink-0 justify-content-center">
-          {/* <label htmlFor='search-bar'>{t('filter.label.search')}</label> */}
           <div className="search-group">
             <input
               id="search-bar"

assets/js/Components/Widgets/UfixitWidget.js

@@ -11,12 +11,9 @@ export default function UfixitWidget({
 
   activeContentItem,
   addMessage,
-  handleFileResolve,
-  handleFileUpload,
   handleIssueSave,
   isContentLoading,
   isErrorFoundInContent = false,
-  sessionIssues,
   setTempActiveIssue,
   tempActiveIssue,
   triggerLiveUpdate
@@ -77,30 +74,19 @@ export default function UfixitWidget({
             <div className="ufixit-widget-label primary mb-1">{t('fix.label.barrier_repair')}</div>
             <div className="flex-column flex-grow-1 justify-content-between ufixit-form-content">
               <div className="callout-container">
-                { tempActiveIssue.contentType === settings.FILTER.FILE_OBJECT ? (
-                  <FileForm
-                    t={t}
-                    settings={settings}
-                    
-                    activeFile={tempActiveIssue.fileData}
-                    handleFileResolve={handleFileResolve}
-                    handleFileUpload={handleFileUpload}
-                    sessionIssues={sessionIssues} /> )
-                  : (
-                  <UfixitForm
-                    t={t}
-                    settings={settings}
+                <UfixitForm
+                  t={t}
+                  settings={settings}
 
-                    activeIssue={tempActiveIssue.issueData}
-                    activeContentItem={activeContentItem}
-                    addMessage={addMessage}
-                    handleActiveIssue={handleActiveIssue}
-                    handleIssueSave={interceptIssueSave}
-                    isContentLoading={isContentLoading}
-                    isDisabled={markAsReviewed || isContentLoading || !isErrorFoundInContent}
-                    markAsReviewed={markAsReviewed}
-                    setMarkAsReviewed={setMarkAsReviewed} /> )
-                }
+                  activeIssue={tempActiveIssue.issueData}
+                  activeContentItem={activeContentItem}
+                  addMessage={addMessage}
+                  handleActiveIssue={handleActiveIssue}
+                  handleIssueSave={interceptIssueSave}
+                  isContentLoading={isContentLoading}
+                  isDisabled={markAsReviewed || isContentLoading || !isErrorFoundInContent}
+                  markAsReviewed={markAsReviewed}
+                  setMarkAsReviewed={setMarkAsReviewed} />
               </div>
             </div>
           </div>

translations/en.json

@@ -134,19 +134,19 @@
   "filter.label.hide_filters": "Hide Filters",
   "filter.label.remove_filter": "Remove Filter: {filterName}",
   "filter.label.severity": "Priority",
-  "filter.label.severity.all": "All Priority Levels",
+  "filter.label.severity.all": "All Barriers",
   "filter.label.severity.issue": "Known Barriers",
   "filter.label.severity.potential": "Potential Barriers",
   "filter.label.severity.suggestion": "Suggestions",
   "filter.label.severity.issue_single": "Known Barrier",
   "filter.label.severity.potential_single": "Potential Barrier",
   "filter.label.severity.suggestion_single": "Suggestion",
   "filter.label.published": "Published",
-  "filter.label.published.all": "Published and Unpublished",
+  "filter.label.published.all": "All Barriers",
   "filter.label.published.published": "Published Only",
   "filter.label.published.unpublished": "Unpublished Only",
   "filter.label.type": "Content Type",
-  "filter.label.type.all": "All Content Types",
+  "filter.label.type.all": "All Barriers",
   "filter.label.type.page": "Pages",
   "filter.label.type.assignment": "Assignments",
   "filter.label.type.announcement": "Announcements",
@@ -167,17 +167,17 @@
   "filter.label.type.syllabus_single": "Syllabus",
   "filter.label.type.module_single": "Module",
   "filter.label.resolution": "Resolution",
-  "filter.label.resolution.all": "All Issues",
-  "filter.label.resolution.active": "Unresolved Issues",
-  "filter.label.resolution.fixed": "Fixed Issues",
-  "filter.label.resolution.resolved": "Reviewed Issues",
+  "filter.label.resolution.all": "All Barriers",
+  "filter.label.resolution.active": "Unresolved Barriers",
+  "filter.label.resolution.fixed": "Fixed Barriers",
+  "filter.label.resolution.resolved": "Reviewed Barriers",
   "filter.label.resolution.fixed_single": "Fixed",
   "filter.label.resolution.resolved_single": "Reviewed",
   "filter.label.review.all": "All Files",
   "filter.label.review.reviewed": "Reviewed Files",
   "filter.label.review.unreviewed": "Unreviewed Files",
   "filter.label.module": "Module",
-  "filter.label.module.all": "All Modules",
+  "filter.label.module.all": "All Barriers",
   "filter.label.utilization": "Referenced in Course",
   "filter.label.utilization.all": "All Files",
   "filter.label.utilization.referenced": "Referenced in Course",

translations/es.json

@@ -7,8 +7,8 @@
   "menu.admin": "Admin",
   "menu.summary": "Resumen",
   "menu.fix_issues": "Solucionar Problemas",
-  "menu.all_barriers": "Todas las Barreras",
-  "menu.review_files": "Revisar Archivos",
+  "menu.all_barriers": "Barreras",
+  "menu.review_files": "Archivos",
   "menu.reports": "Reportes",
   "menu.settings": "Configuraciones",
   "menu.admin.courses": "Cursos",
@@ -52,26 +52,26 @@
   "report.title.issues_by_type": "Barreras Por Tipo",
   "report.title.scan_history": "Historial de Escaneo",
   "report.title.options": "Opciones",
-  "report.option.show_issues": "Mostrar Problemas",
-  "report.option.show_potential": "Mostrar Problemas Posibles",
-  "report.option.show_suggestions": "Mostrar Sugerencias",
   "report.label.progress_over_time": "Progreso a Través del Tiempo",
   "report.option.show_chart": "Mostrar Gráfico",
   "report.option.show_table": "Mostrar Tabla",
   "report.header.issue_type": "Tipo de Problema",
   "report.header.severity": "Prioridad",
   "report.header.active": "Activo",
   "report.header.fixed": "Corregido",
-  "report.header.resolved": "Resuelto",
+  "report.header.resolved": "Revisado",
+  "report.header.handled": "Resuelto",
   "report.header.total": "Total",
   "report.header.date": "Fecha",
   "report.header.courses": "Cursos",
   "report.header.users": "Usuarios",
   "report.header.issues": "Problemas",
   "report.header.potential": "Problemas Posibles",
   "report.header.suggestions": "Sugerencias",
-  "report.header.items_fixed": "Ítems Corregidos",
-  "report.header.items_resolved": "Ítems Resueltos",
+  "report.header.files_unreviewed": "Archivos No Revisados",
+  "report.header.items_fixed": "Barreras Corregidos",
+  "report.header.items_resolved": "Barreras Revisadas",
+  "report.header.items_handled": "Barreras Resueltas",
   "report.header.files_reviewed": "Archivos Revisados",
   "report.header.course_name": "Nombre del Curso",
   "report.header.all_courses": "Todos los Cursos",
@@ -134,19 +134,19 @@
   "filter.label.hide_filters": "Ocultar Filtros",
   "filter.label.remove_filter": "Eliminar Filtro: {filterName}",
   "filter.label.severity": "Prioridad",
-  "filter.label.severity.all": "Todos los Niveles de Prioridad",
+  "filter.label.severity.all": "Todas las Barreras",
   "filter.label.severity.issue": "Barreras Conocidas",
   "filter.label.severity.potential": "Barreras Posibles",
   "filter.label.severity.suggestion": "Sugerencias",
   "filter.label.severity.issue_single": "Barrera Conocida",
   "filter.label.severity.potential_single": "Barrera Posible",
   "filter.label.severity.suggestion_single": "Sugerencia",
   "filter.label.published": "Publicado",
-  "filter.label.published.all": "Publicado y No Publicado",
+  "filter.label.published.all": "Todas las Barreras",
   "filter.label.published.published": "Solo Publicado",
   "filter.label.published.unpublished": "Solo No Publicado",
   "filter.label.type": "Tipo de Contenido",
-  "filter.label.type.all": "Todos los Tipos de Contenido",
+  "filter.label.type.all": "Todas las Barreras",
   "filter.label.type.page": "Páginas",
   "filter.label.type.assignment": "Asignaciones",
   "filter.label.type.announcement": "Anuncios",
@@ -167,14 +167,23 @@
   "filter.label.type.syllabus_single": "Programa del Curso",
   "filter.label.type.module_single": "Modulo",
   "filter.label.resolution": "Resolución",
-  "filter.label.resolution.all": "Todos los Problemas",
-  "filter.label.resolution.active": "Problemas No Resueltos",
-  "filter.label.resolution.fixed": "Problemas Corregidos",
-  "filter.label.resolution.resolved": "Problemas Resueltos",
+  "filter.label.resolution.all": "Todas las Barreras",
+  "filter.label.resolution.active": "Barreras No Resueltas",
+  "filter.label.resolution.fixed": "Barreras Corregidas",
+  "filter.label.resolution.resolved": "Barreras Resueltas",
   "filter.label.resolution.fixed_single": "Corregido",
   "filter.label.resolution.resolved_single": "Resuelto",
+  "filter.label.review.all": "Todos los Archivos",
+  "filter.label.review.reviewed": "Archivos Revisados",
+  "filter.label.review.unreviewed": "Archivos No Revisados",
   "filter.label.module": "Módulo",
-  "filter.label.module.all": "Todos los Módulos",
+  "filter.label.module.all": "Todas las Barreras",
+  "filter.label.utilization": "TODO: Referenced in Course",
+  "filter.label.utilization.all": "TODO: All Files",
+  "filter.label.utilization.referenced": "TODO: Referenced in Course",
+  "filter.label.utilization.unreferenced": "TODO: Not Referenced in Course",
+  "filter.label.file_type": "Tipo de Archivo",
+  "filter.label.file_type.all": "Todos los Archivos",
   "filter.label.select.issue": "Seleccionar Problema",
   "filter.label.active": "Problemas Activos",
   "filter.label.fixed": "Problemas Corregidos",
@@ -219,9 +228,12 @@
   "fix.button.resolved": "Marcar como Resuelto",
   "fix.button.unresolved": "Marcar como No Resuelto",
   "fix.button.lms_solve": "Resolver en el LMS",
-  "fix.button.previous": "Anterior",
-  "fix.button.list": "Mostrar Lista",
-  "fix.button.next": "Siguiente",
+  "fix.button.previous": "Barrera Anterior",
+  "fix.button.list": "Todas las Barreras",
+  "fix.button.next": "Barrera Siguiente",
+  "fix.button.previous_file": "Archivo Anterior",
+  "fix.button.files": "Todos los Archivos",
+  "fix.button.next_file": "Archive Siguiente",
   "fix.button.scroll_to_issue": "Desplazar al Problema",
   "fix.button.show_no_error_preview": "Mostrar Vista Previa del Contenido",
   "fix.msg.select_issue": "Seleccionar un problema de la lista para ver sus detalles y corregirlo o marcarlo como resuelto.",
@@ -236,6 +248,8 @@
   "label.mime.doc": "MS Word",
   "label.mime.ppt": "MS PowerPoint",
   "label.mime.xls": "MS Excel",
+  "label.mime.video": "Archivo de Video",
+  "label.mime.audio": "Archivo de Audio",
 
   "msg.no_permissions": "No tienes permiso para acceder este curso especifico.",
   "msg.course_scanning": "Escaneando el curso...",