Skip to content

Commit e77e2a9

Browse files
138928: fixed pdf-viewer-enabled patch request not being send
1 parent 2da7bce commit e77e2a9

20 files changed

Lines changed: 69 additions & 76 deletions

File tree

src/app/app-routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ import {
3636
WORKFLOW_ITEM_MODULE_PATH,
3737
} from './app-routing-paths';
3838
import { notAuthenticatedGuard } from './core/auth/not-authenticated.guard';
39-
import { PDF_VIEWER_MODULE_PATH } from './pdf-viewer/pdf-viewer-routing-paths';
4039
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
4140
import { homePageResolver } from './home-page/home-page.resolver';
4241
import { provideSuggestionNotificationsState } from './notifications/provide-suggestion-notifications-state';
4342
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
4443
import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
4544
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
45+
import { PDF_VIEWER_MODULE_PATH } from './pdf-viewer/pdf-viewer-routing-paths';
4646
import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
4747
import { viewTrackerResolver } from './statistics/angulartics/dspace/view-tracker.resolver';
4848
import { provideSubmissionState } from './submission/provide-submission-state';

src/app/app.reducer.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ import {
4343
} from './shared/form/form.reducer';
4444
import { menusReducer } from './shared/menu/menu.reducer';
4545
import { MenusState } from './shared/menu/menus-state.model';
46-
import {
47-
pdfViewerFullscreenReducer,
48-
PdfViewerFullscreenState,
49-
} from './shared/pdf-viewer-fullscreen/pdf-viewer-fullscreen.reducer';
5046
import {
5147
selectableListReducer,
5248
SelectableListsState,
@@ -55,6 +51,10 @@ import {
5551
ObjectSelectionListState,
5652
objectSelectionReducer,
5753
} from './shared/object-select/object-select.reducer';
54+
import {
55+
pdfViewerFullscreenReducer,
56+
PdfViewerFullscreenState,
57+
} from './shared/pdf-viewer-fullscreen/pdf-viewer-fullscreen.reducer';
5858
import {
5959
cssVariablesReducer,
6060
CSSVariablesState,

src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ import {
6666
} from 'rxjs/operators';
6767

6868
import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
69+
import { PdfViewerEnableComponent } from '../../pdf-viewer/pdf-viewer-enable/pdf-viewer-enable.component';
6970
import { ErrorComponent } from '../../shared/error/error.component';
7071
import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
7172
import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
@@ -76,7 +77,6 @@ import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.comp
7677
import { FileSizePipe } from '../../shared/utils/file-size-pipe';
7778
import { VarDirective } from '../../shared/utils/var.directive';
7879
import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.component';
79-
import { PdfViewerEnableComponent } from '../../pdf-viewer/pdf-viewer-enable/pdf-viewer-enable.component';
8080

8181
@Component({
8282
selector: 'ds-base-edit-bitstream-page',
@@ -85,17 +85,16 @@ import { PdfViewerEnableComponent } from '../../pdf-viewer/pdf-viewer-enable/pdf
8585
changeDetection: ChangeDetectionStrategy.OnPush,
8686
imports: [
8787
AsyncPipe,
88-
PdfViewerEnableComponent,
8988
ErrorComponent,
9089
FileSizePipe,
9190
FormComponent,
91+
PdfViewerEnableComponent,
9292
RouterLink,
9393
ThemedLoadingComponent,
9494
ThemedThumbnailComponent,
9595
TranslateModule,
9696
VarDirective,
9797
],
98-
standalone: true,
9998
})
10099
/**
101100
* Page component for editing a bitstream

src/app/collection-page/edit-collection-page/edit-collection-page-routes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Route } from '@angular/router';
22
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
33
import { collectionAdministratorGuard } from '@dspace/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard';
4+
45
import { PdfViewerEnableDsoComponent } from '../../pdf-viewer/pdf-viewer-enable-dso/pdf-viewer-enable-dso.component';
56
import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
67
import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';

src/app/community-page/edit-community-page/edit-community-page-routes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Route } from '@angular/router';
22
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
33
import { communityAdministratorGuard } from '@dspace/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard';
4+
45
import { PdfViewerEnableDsoComponent } from '../../pdf-viewer/pdf-viewer-enable-dso/pdf-viewer-enable-dso.component';
56
import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
67
import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';

src/app/core/shared/bundle.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import { RemoteData } from '../data/remote-data';
1313
import { Bitstream } from './bitstream.model';
1414
import { BITSTREAM } from './bitstream.resource-type';
1515
import { BUNDLE } from './bundle.resource-type';
16+
import { ChildHALResource } from './child-hal-resource.model';
1617
import { DSpaceObject } from './dspace-object.model';
1718
import { HALLink } from './hal-link.model';
1819
import { Item } from './item.model';
1920
import { ITEM } from './item.resource-type';
20-
import { ChildHALResource } from './child-hal-resource.model';
2121

2222
@typedObject
2323
@inheritSerialization(DSpaceObject)

src/app/item-page/edit-item-page/edit-item-page-routes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Route } from '@angular/router';
22
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
3-
import { PdfViewerEnableDsoComponent } from '../../pdf-viewer/pdf-viewer-enable-dso/pdf-viewer-enable-dso.component';
3+
44
import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
5+
import { PdfViewerEnableDsoComponent } from '../../pdf-viewer/pdf-viewer-enable-dso/pdf-viewer-enable-dso.component';
56
import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
67
import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
78
import { resourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';

src/app/pdf-viewer/breadcrumbs/pdf-viewer-page-breadcrumb.resolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
} from '@angular/router';
77
import { Observable } from 'rxjs';
88

9-
import { BreadcrumbConfig } from '../../core/breadcrumbs/models/breadcrumb-config.model';
109
import { DSOBreadcrumbResolver } from '../../core/breadcrumbs/dso-breadcrumb.resolver';
10+
import { BreadcrumbConfig } from '../../core/breadcrumbs/models/breadcrumb-config.model';
1111
import { BitstreamDataService } from '../../core/data/bitstream-data.service';
1212
import { Bitstream } from '../../core/shared/bitstream.model';
1313
import { DSpaceObject } from '../../core/shared/dspace-object.model';

src/app/pdf-viewer/breadcrumbs/pdf-viewer-page-breadcrumbs.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Injectable } from '@angular/core';
2+
import { hasValue } from '@dspace/shared/utils/empty.util';
23
import {
34
Observable,
45
of,
@@ -9,17 +10,16 @@ import {
910
switchMap,
1011
} from 'rxjs/operators';
1112

12-
import { getDSORoute } from '../../core/router/utils/dso-route.utils';
13-
import { Breadcrumb } from '../../core/breadcrumbs/models/breadcrumb.model';
1413
import { DSOBreadcrumbsService } from '../../core/breadcrumbs/dso-breadcrumbs.service';
1514
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
15+
import { Breadcrumb } from '../../core/breadcrumbs/models/breadcrumb.model';
1616
import { LinkService } from '../../core/cache/builders/link.service';
1717
import { RemoteData } from '../../core/data/remote-data';
18+
import { getDSORoute } from '../../core/router/utils/dso-route.utils';
1819
import { BITSTREAM } from '../../core/shared/bitstream.resource-type';
1920
import { BUNDLE } from '../../core/shared/bundle.resource-type';
2021
import { ChildHALResource } from '../../core/shared/child-hal-resource.model';
2122
import { DSpaceObject } from '../../core/shared/dspace-object.model';
22-
import { hasValue } from '@dspace/shared/utils/empty.util';
2323
import { followLink } from '../../core/shared/follow-link-config.model';
2424

2525
@Injectable({

src/app/pdf-viewer/pdf-viewer-back-button/pdf-viewer-back-button.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { PdfViewerFullscreenService } from '../../shared/pdf-viewer-fullscreen/p
1515
selector: 'ds-pdf-viewer-back-button',
1616
templateUrl: './pdf-viewer-back-button.component.html',
1717
styleUrls: ['./pdf-viewer-back-button.component.scss'],
18-
standalone: true,
1918
})
2019
export class PdfViewerBackButtonComponent implements OnInit {
2120
canGoBack: boolean;

0 commit comments

Comments
 (0)