forked from DSpace/dspace-angular
-
Notifications
You must be signed in to change notification settings - Fork 1
PPS Feli pasada a SEDICI 9.3 #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
178Pelado
wants to merge
59
commits into
sedici-9.3
Choose a base branch
from
pps_feli_v9
base: sedici-9.3
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
59 commits
Select commit
Hold shift + click to select a range
2fa4e37
primera versión extractor y filtros
178Pelado 3a5a062
creo y modifico filtros. separo componente botones acceso rápido. mod…
178Pelado 566dbec
cambio iconos filtros y agrego extracción "Tomo" en números romanos
178Pelado a387484
comento el evento que resetea el submission al hacer click en otra se…
178Pelado 9cf86c1
soluciono el error que hacía que algunos campos tarden más que el res…
178Pelado 203dad7
refactoring general
178Pelado 9cfa9a7
limpieza código estilos
178Pelado 5814fa1
saco el header fixed si estoy en submission, así aprovecho la pantall…
178Pelado d1207d8
el móludo solo se activa si estoy con un Administrator o un SeDiCIAdmin
178Pelado 8222bcc
el texto seleccionado se centra verticalmente y los botones aparecen …
178Pelado 5606b65
cambio el firltro toCapitalize para que acepte acentos y ñ
178Pelado dd2700e
cambio la lógica de recuperación de campos disponibles, ahora se pued…
178Pelado 03fcf13
elimino el resto de accesos rápidos, dejo solo uno que sirve para tod…
178Pelado 7376c31
agrego métodos para ver si es una o varias personas y otro para una l…
178Pelado c470676
agregos casos a la obtención de info de revistas y fechas
178Pelado 68d0e44
preparo mejor la obtención de palabras claves
178Pelado a32fe98
agrego/mejoro textos explicativos
178Pelado 3e7ac63
Agrego un modo automático que aplica directamente el filtro (según el…
178Pelado d66dc61
Se agrega la posibilidad de concatenar texto en el previsualizador, a…
178Pelado 824cd33
Saco el menú de agregar/reemplazar/concatenar.
178Pelado 8c10963
Cambio la vista a 5 (formulario) y 7 (PDF) columnas en lugar de 6 y 6.
178Pelado 43dc271
cambio la forma de generación y eliminación de los botones de aplicac…
178Pelado 83ad62a
Primera versión acomodada de los filtros. Asociados a inpust y asocia…
178Pelado 8101bd5
cambio tamaños y cantidades. Principalmente pensado para la vista en …
178Pelado 4b82f50
parcheo la generación de botones para aplicar filtros a los campos de…
178Pelado bdbd0c7
Agrego nuevo caso de uso al campo de fechas
178Pelado 146bf73
agrego nuevo separador al split
178Pelado d300fe4
mejoro la eliminación de botones duplicados. mejoro la lógica del apl…
178Pelado 382db72
Nueva lógica para el reordenamiento de nombres de personas.
178Pelado 62646a6
mejoro la apariencia de los filtros aplicados al formulario
178Pelado 79a2c12
agrego el viejo norm.php de sedici5
178Pelado fb89d90
no aplico el norm sobre palabras claves porque rompe los delimitadores
178Pelado dd18e02
Creo una primera versión del código para acomodar acentos mál puestos…
178Pelado a7d2958
hago que no se normalicen los autores a nivel símbolos, porque falla …
178Pelado 3ef81e4
Agrego más casos a la recuperación de volúmen y número de artículos
178Pelado 8205a20
Agrego más casos a la recuperación de volúmen y número de artículos
178Pelado 9df0b95
Migración del código a la rama de sedici-9.2
178Pelado 13cde2a
actualización general de la sintaxis de angular (extrartor PDf + comp…
178Pelado 39c1df0
vuelvo a permitir que los autores aparezcan con su filiación al momen…
178Pelado aeb81a0
Acomodo los botones y sus estilos, para la nueva versión de DSpace.
178Pelado 9d582ff
Elimino un console.log innecesario
178Pelado 05a8180
Renombro un método que había quedado con nombre genérico de prueba
178Pelado 09b6430
Merge remote-tracking branch 'origin/sedici-9.3' into pps_feli_v9
178Pelado 3869593
Agrego el label como nombre en el selector dinámico de campos
178Pelado 58f7914
Agrego la limpieza de saltos de línea al método que hace la limpieza …
178Pelado d5fceab
Saco el fixed del header en el submission (código que se modificó per…
178Pelado a8bd189
Elimino estilos inline y los paso a clases
178Pelado 97834e4
Cambio la lógica para no usar "!important" en un estilo
178Pelado 460242f
Elimino método que no se usaba y un comentario innecesario
178Pelado cb2b852
Elimino .html que era una página de prueba
178Pelado 1c28e15
Soluciono memory leaks y race conditions en la creación de botonesde …
178Pelado 49b9616
Solamente se observa el ds-submission-form y no el body completo
178Pelado 8efa87e
Almacenar la suscripción y desvincularla explícitamente al remover el…
178Pelado 576d245
Chequeo de metadataYear, metadataMonth y metadataDay por si son null
178Pelado cddb942
Elimino estilos inline del .ts, los convierto en clases y los paso al…
178Pelado 524f272
Soluciono memory leaks en la escucha de la selección de texto
178Pelado 2897cf8
Saco la referencia a una dependencia deprecada, que se usaba para la …
178Pelado 1234e34
Soluciono memory leaks en el manejo de botones
178Pelado 5c55a90
Saco el focus del campo de metadatos, una vez cargado su contenido
178Pelado File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
306 changes: 159 additions & 147 deletions
306
src/app/item-page/sedici-item-certificate/sedici-item-certificate.html
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 18 additions & 8 deletions
26
src/app/item-page/sedici-print-certificate/sedici-print-certificate.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,21 @@ | ||
| <div class="container" *ngVar="(itemRD$ | async) as itemRD"> | ||
| <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut> | ||
| <div *ngIf="itemRD?.payload as item"> | ||
| <ds-sedici-certificate *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-sedici-certificate> | ||
| <!--<ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>--> | ||
| <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions> | ||
| @if (itemRD?.hasSucceeded) { | ||
| <div class="item-page" @fadeInOut> | ||
| @if (itemRD?.payload; as item) { | ||
| <div> | ||
| @if (!item.isWithdrawn || (isAdmin$|async)) { | ||
| <ds-sedici-certificate [object]="item" [viewMode]="viewMode"></ds-sedici-certificate> | ||
| } | ||
| <!--<ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>--> | ||
| <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions> | ||
| </div> | ||
| } | ||
| </div> | ||
| </div> | ||
| <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error> | ||
| <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading> | ||
| } | ||
| @if (itemRD?.hasFailed) { | ||
| <ds-error message="{{'error.item' | translate}}"></ds-error> | ||
| } | ||
| @if (itemRD?.isLoading) { | ||
| <ds-loading message="{{'loading.item' | translate}}"></ds-loading> | ||
| } | ||
| </div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,6 +86,7 @@ export class RootComponent implements OnInit { | |
| maxMobileWidth = WidthCategory.SM; | ||
|
|
||
| public isHomePage$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false); | ||
| public isSubmissionPage$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false); | ||
| private routerSubscription: Subscription; | ||
|
|
||
| /** | ||
|
|
@@ -146,15 +147,18 @@ export class RootComponent implements OnInit { | |
|
|
||
| const currentUrl = this.router.url; | ||
| this.isHomePage$.next(this.isHomeUrl(currentUrl)); | ||
| this.isSubmissionPage$.next(this.isSubmissionUrl(currentUrl)); | ||
|
|
||
| this.routerSubscription = this.router.events.pipe( | ||
| filter(event => event instanceof NavigationEnd), | ||
| map((event: NavigationEnd) => { | ||
| const isHome = this.isHomeUrl(event.urlAfterRedirects); | ||
| return isHome; | ||
| const isSubmission = this.isSubmissionUrl(event.urlAfterRedirects); | ||
| return { isHome, isSubmission }; | ||
| }) | ||
| ).subscribe(isHome => { | ||
| ).subscribe(({ isHome, isSubmission }) => { | ||
| this.isHomePage$.next(isHome); | ||
| this.isSubmissionPage$.next(isSubmission); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -171,6 +175,10 @@ export class RootComponent implements OnInit { | |
| url.startsWith('/home?'); | ||
| } | ||
|
|
||
| private isSubmissionUrl(url: string): boolean { | ||
| return url.startsWith('/workspaceitems') && url.endsWith('/edit'); | ||
| } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. En general los cambios son los mismos del header.component.ts |
||
|
|
||
| skipToMainContent() { | ||
| const mainContent = document.getElementById('main-content'); | ||
| if (mainContent) { | ||
|
|
||
20 changes: 11 additions & 9 deletions
20
src/app/shared/edit-item-menu/edit-item-menu.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,12 @@ | ||
| <div *ngIf="(isAuthenticated | async) && contextMenuObject" ngbDropdown #itemOptions="ngbDropdown" placement="bottom-right" class="d-inline-block float-end"> | ||
| <button class="btn btn-outline-primary" id="itemOptions" ngbDropdownToggle><i class="fas fa-ellipsis-v" aria-hidden="true"></i></button> | ||
| <div id="itemOptionsDropdownMenu" aria-labelledby="itemOptions" ngbDropdownMenu> | ||
| <h6 class="dropdown-header">{{'context-menu.actions.label' | translate}}</h6> | ||
| <button ngbDropdownItem | ||
| [routerLink]="['/edit-items', contextMenuObject.id,'form']"> | ||
| Editar como submission | ||
| </button> | ||
| @if ((isAuthenticated | async) && contextMenuObject) { | ||
| <div ngbDropdown #itemOptions="ngbDropdown" placement="bottom-right" class="d-inline-block float-end"> | ||
| <button class="btn btn-outline-primary" id="itemOptions" ngbDropdownToggle><i class="fas fa-ellipsis-v" aria-hidden="true"></i></button> | ||
| <div id="itemOptionsDropdownMenu" aria-labelledby="itemOptions" ngbDropdownMenu> | ||
| <h6 class="dropdown-header">{{'context-menu.actions.label' | translate}}</h6> | ||
| <button ngbDropdownItem | ||
| [routerLink]="['/edit-items', contextMenuObject.id,'form']"> | ||
| Editar como submission | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,3 +46,8 @@ | |
| label { | ||
| margin-bottom: 0.25rem; | ||
| } | ||
|
|
||
| .languageCodesSelector { | ||
| width: auto; | ||
| padding: 0; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 10 additions & 6 deletions
16
...med-task/sedici-approve-not-select/claimed-task-actions-approve_not_select.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| <button type="button" | ||
| [className]="'btn btn-success'" | ||
| ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}" | ||
| [disabled]="processing$ | async" | ||
| (click)="submitTask()"> | ||
| <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span> | ||
| <span *ngIf="(processing$ | async) !== true"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve_not_select' | translate}}</span> | ||
| [className]="'btn btn-success'" | ||
| ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}" | ||
| [disabled]="processing$ | async" | ||
| (click)="submitTask()"> | ||
| @if (processing$ | async) { | ||
| <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span> | ||
| } | ||
| @if ((processing$ | async) !== true) { | ||
| <span><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve_not_select' | translate}}</span> | ||
| } | ||
| </button> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/app/submission/form/dynamic-button-dropdown.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <div class="dropdown-container"> | ||
| <button class="btn btn-secondary" title="Opciones" aria-label="Opciones" (click)="toggleDropdown($event)"> | ||
| <span><i class="fa-solid fa-wand-magic-sparkles"></i></span> | ||
| </button> | ||
|
|
||
| <div #dropdown class="dropdown-menu"> | ||
| @for (option of options; track option) { | ||
| <div (click)="applyFilter(option.id)" class="dropdown-item" [title]="option.description"> | ||
| @if (option.icon) { | ||
| <i [class]="option.icon"></i> | ||
| } @else { | ||
| <span>{{ option.label }}</span> | ||
| } | ||
| </div> | ||
| } | ||
| </div> | ||
| </div> |
37 changes: 37 additions & 0 deletions
37
src/app/submission/form/dynamic-button-dropdown.component.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| :host { | ||
| display: inline-block; | ||
| width: auto; | ||
| padding: 0; | ||
| flex: 0 0 auto; | ||
| } | ||
|
|
||
| .dropdown-container { | ||
| position: relative; | ||
| display: inline-block; | ||
|
|
||
| .btn { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .dropdown-menu { | ||
| padding: 8px; | ||
| gap: 10px; | ||
| right: 0; | ||
|
|
||
| .dropdown-item { | ||
| cursor: pointer; | ||
| width: 40px; | ||
| height: 40px; | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| background-color: #e9e9e9; | ||
|
|
||
| &:hover { | ||
| background-color: #e0e0e0; | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment?