Skip to content

Commit b5c9bbd

Browse files
committed
switch angular/flex-lyaout to ngy-layout
ngy-layout is a replacement clone for the discontinued flex-layout. See https://blog.angular.io/modern-css-in-angular-layouts-4a259dca9127 and angular/flex-layout#1426 (comment) Change-Id: Id6f743428d52e8e34ecbddcc3d7b28c1345a3a90
1 parent b1ada96 commit b5c9bbd

25 files changed

+42
-25
lines changed

package-lock.json

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
},
1818
"private": true,
1919
"dependencies": {
20+
"@angular-material-components/datetime-picker": "^16",
2021
"@angular/animations": "^16",
2122
"@angular/cdk": "^16",
2223
"@angular/common": "^16",
@@ -29,7 +30,7 @@
2930
"@angular/platform-server": "^16",
3031
"@angular/router": "^16",
3132
"@angular/service-worker": "^16",
32-
"@angular-material-components/datetime-picker": "^16",
33+
"@ngbracket/ngx-layout": "^16.0.0",
3334
"@ngrx/effects": "^16",
3435
"@ngrx/router-store": "^16",
3536
"@ngrx/store": "^16",
@@ -50,8 +51,8 @@
5051
"zone.js": "^0.13"
5152
},
5253
"devDependencies": {
54+
"@angular-devkit/build-angular": "^16",
5355
"@angular-devkit/core": "^16",
54-
"@angular-devkit/build-angular":"^16",
5556
"@angular-eslint/builder": "^16",
5657
"@angular-eslint/eslint-plugin": "^16",
5758
"@angular-eslint/eslint-plugin-template": "^16",

src/app/about/about.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
22
import { CommonModule } from "@angular/common";
33
import { AboutComponent } from "./about/about.component";
44
import { MatCardModule } from "@angular/material/card";
5-
import { FlexLayoutModule } from "@angular/flex-layout";
5+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
66
import { LinkyModule } from "ngx-linky";
77

88
@NgModule({

src/app/datasets/datasets.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { LinkyModule } from "ngx-linky";
44
import { ArchivingService } from "./archiving.service";
55
import { BatchViewComponent } from "./batch-view/batch-view.component";
66
import { AsyncPipe, CommonModule } from "@angular/common";
7-
import { FlexLayoutModule } from "@angular/flex-layout";
7+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
88
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
99
import { MatButtonToggleModule } from "@angular/material/button-toggle";
1010
import { MatChipsModule } from "@angular/material/chips";

src/app/files/files.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CommonModule } from "@angular/common";
33
import { MatButtonToggleModule } from "@angular/material/button-toggle";
44
import { MatCardModule } from "@angular/material/card";
55
import { MatIconModule } from "@angular/material/icon";
6-
import { FlexLayoutModule } from "@angular/flex-layout";
6+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
77
import { SharedScicatFrontendModule } from "shared/shared.module";
88
import { FilesDashboardComponent } from "./files-dashboard/files-dashboard.component";
99

src/app/instruments/instrument-details/instrument-details.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { saveCustomMetadataAction } from "state-management/actions/instruments.a
1616
import { MatCardModule } from "@angular/material/card";
1717
import { MatIconModule } from "@angular/material/icon";
1818
import { MatTabsModule } from "@angular/material/tabs";
19-
import { FlexLayoutModule } from "@angular/flex-layout";
19+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2020
import { AppConfigService } from "app-config.service";
2121

2222
const getConfig = () => ({

src/app/instruments/instruments-dashboard/instruments-dashboard.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
} from "state-management/actions/instruments.actions";
2424
import { Router } from "@angular/router";
2525
import { Instrument } from "shared/sdk";
26-
import { FlexLayoutModule } from "@angular/flex-layout";
26+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2727

2828
describe("InstrumentsDashboardComponent", () => {
2929
let component: InstrumentsDashboardComponent;

src/app/instruments/instruments.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule } from "@angular/core";
22
import { CommonModule } from "@angular/common";
33
import { InstrumentsDashboardComponent } from "./instruments-dashboard/instruments-dashboard.component";
4-
import { FlexLayoutModule } from "@angular/flex-layout";
4+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
55
import { StoreModule } from "@ngrx/store";
66
import { instrumentsReducer } from "state-management/reducers/instruments.reducer";
77
import { EffectsModule } from "@ngrx/effects";

src/app/jobs/jobs-dashboard/jobs-dashboard.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from "state-management/actions/jobs.actions";
2121
import { PageChangeEvent } from "shared/modules/table/table.component";
2222
import { MatButtonToggleModule } from "@angular/material/button-toggle";
23-
import { FlexLayoutModule } from "@angular/flex-layout";
23+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2424
import { MatCardModule } from "@angular/material/card";
2525
import { MatIconModule } from "@angular/material/icon";
2626

src/app/jobs/jobs.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { MatCardModule } from "@angular/material/card";
99
import { MatIconModule } from "@angular/material/icon";
1010
import { StoreModule } from "@ngrx/store";
1111
import { jobsReducer } from "state-management/reducers/jobs.reducer";
12-
import { FlexLayoutModule } from "@angular/flex-layout";
12+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
1313
import { SharedScicatFrontendModule } from "shared/shared.module";
1414
import { JobsDashboardNewComponent } from "./jobs-dashboard-new/jobs-dashboard-new.component";
1515

src/app/logbooks/logbooks.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { MatIconModule } from "@angular/material/icon";
1010
import { MatPaginatorModule } from "@angular/material/paginator";
1111
import { MatSortModule } from "@angular/material/sort";
1212
import { MatTableModule } from "@angular/material/table";
13-
import { FlexLayoutModule } from "@angular/flex-layout";
13+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
1414
import { LinkyModule } from "ngx-linky";
1515
import { RouterModule } from "@angular/router";
1616
import { SharedScicatFrontendModule } from "shared/shared.module";

src/app/policies/policies-dashboard/policies-dashboard.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {
4242
import { MatCheckboxChange } from "@angular/material/checkbox";
4343
import { MatButtonModule } from "@angular/material/button";
4444
import { MatIconModule } from "@angular/material/icon";
45-
import { FlexLayoutModule } from "@angular/flex-layout";
45+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
4646
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
4747

4848
describe("PoliciesDashboardComponent", () => {

src/app/policies/policies.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { SharedScicatFrontendModule } from "shared/shared.module";
2626
import { StoreModule } from "@ngrx/store";
2727
import { policiesReducer } from "state-management/reducers/policies.reducer";
2828
import { PoliciesDashboardComponent } from "./policies-dashboard/policies-dashboard.component";
29-
import { FlexModule } from "@angular/flex-layout";
29+
import { FlexModule } from "@ngbracket/ngx-layout";
3030

3131
@NgModule({
3232
imports: [

src/app/proposals/proposals.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { MatTableModule } from "@angular/material/table";
2525
import { MatTabsModule } from "@angular/material/tabs";
2626
import { MatTooltipModule } from "@angular/material/tooltip";
2727
import { SharedScicatFrontendModule } from "shared/shared.module";
28-
import { FlexLayoutModule } from "@angular/flex-layout";
28+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2929
import { FileSizePipe } from "shared/pipes/filesize.pipe";
3030
import { ProposalFilterComponent } from "./proposal-filter/proposal-filter.component";
3131
import { LogbooksModule } from "logbooks/logbooks.module";

src/app/publisheddata/publisheddata-dashboard/publisheddata-dashboard.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { MatCheckboxChange } from "@angular/material/checkbox";
1616
import { of } from "rxjs";
1717
import { Message, MessageType } from "state-management/models";
1818
import { showMessageAction } from "state-management/actions/user.actions";
19-
import { FlexLayoutModule } from "@angular/flex-layout";
19+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2020
import { MatButtonModule } from "@angular/material/button";
2121
import { MatIconModule } from "@angular/material/icon";
2222
import { AppConfigService } from "app-config.service";

src/app/publisheddata/publisheddata-edit/publisheddata-edit.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { MatInputModule } from "@angular/material/input";
2424
import { MatSelectModule } from "@angular/material/select";
2525
import { MatOptionModule } from "@angular/material/core";
2626
import { MatButtonModule } from "@angular/material/button";
27-
import { FlexLayoutModule } from "@angular/flex-layout";
27+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2828

2929
describe("PublisheddataEditComponent", () => {
3030
let component: PublisheddataEditComponent;

src/app/publisheddata/publisheddata.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { StoreModule } from "@ngrx/store";
1414
import { publishedDataReducer } from "state-management/reducers/published-data.reducer";
1515
import { PublisheddataDashboardComponent } from "./publisheddata-dashboard/publisheddata-dashboard.component";
1616
import { PublisheddataEditComponent } from "./publisheddata-edit/publisheddata-edit.component";
17-
import { FlexLayoutModule } from "@angular/flex-layout";
17+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
1818
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
1919
import { MatFormFieldModule } from "@angular/material/form-field";
2020
import { MatChipsModule } from "@angular/material/chips";

src/app/samples/sample-dashboard/sample-dashboard.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { SampleDialogComponent } from "samples/sample-dialog/sample-dialog.compo
2424
import { MatCardModule } from "@angular/material/card";
2525
import { MatDialogModule } from "@angular/material/dialog";
2626
import { MatTableModule } from "@angular/material/table";
27-
import { FlexLayoutModule } from "@angular/flex-layout";
27+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2828
import { MatButtonModule } from "@angular/material/button";
2929
import { MatIconModule } from "@angular/material/icon";
3030
import { MatChipsModule } from "@angular/material/chips";

src/app/samples/sample-detail/sample-detail.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { MatButtonModule } from "@angular/material/button";
2929
import { MatCardModule } from "@angular/material/card";
3030
import { MatIconModule } from "@angular/material/icon";
3131
import { MatTabsModule } from "@angular/material/tabs";
32-
import { FlexLayoutModule } from "@angular/flex-layout";
32+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
3333
import { AppConfigService } from "app-config.service";
3434

3535
const getConfig = () => ({

src/app/samples/samples.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { samplesReducer } from "../state-management/reducers/samples.reducer";
1616
import { SampleDialogComponent } from "./sample-dialog/sample-dialog.component";
1717
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
1818
import { SampleDashboardComponent } from "./sample-dashboard/sample-dashboard.component";
19-
import { FlexLayoutModule } from "@angular/flex-layout";
19+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2020
import { NgxJsonViewerModule } from "ngx-json-viewer";
2121
import { SharedScicatFrontendModule } from "shared/shared.module";
2222
import { MatChipsModule } from "@angular/material/chips";

src/app/shared/modules/scientific-metadata-tree/scientific-metadata-tree.modules.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { MatAutocompleteModule } from "@angular/material/autocomplete";
1010
import { CommonModule, DatePipe } from "@angular/common";
1111
import { MatInputModule } from "@angular/material/input";
1212
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
13-
import { FlexLayoutModule, FlexModule } from "@angular/flex-layout";
13+
import { FlexLayoutModule, FlexModule } from "@ngbracket/ngx-layout";
1414
import { MatDividerModule } from "@angular/material/divider";
1515
import { TreeViewComponent } from "./tree-view/tree-view.component";
1616
import { MatButtonToggleModule } from "@angular/material/button-toggle";

src/app/shared/modules/scientific-metadata/scientific-metadata.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { MetadataViewComponent } from "./metadata-view/metadata-view.component";
1313
import { MetadataEditComponent } from "./metadata-edit/metadata-edit.component";
1414
import { PipesModule } from "shared/pipes/pipes.module";
1515
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
16-
import { FlexModule } from "@angular/flex-layout";
16+
import { FlexModule } from "@ngbracket/ngx-layout";
1717

1818
@NgModule({
1919
declarations: [MetadataViewComponent, MetadataEditComponent],

src/app/shared/modules/shared-table/shared-table.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { MatToolbarModule } from "@angular/material/toolbar";
2525
import { MatFormFieldModule } from "@angular/material/form-field";
2626
import { MatInputModule } from "@angular/material/input";
2727
import { MatButtonModule } from "@angular/material/button";
28-
import { FlexLayoutModule } from "@angular/flex-layout";
28+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
2929
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
3030
import { ObjKeysPipe } from "shared/pipes/obj-keys.pipe";
3131
import { RouterModule } from "@angular/router";

src/app/users/user-settings/user-settings.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { UserSettingsComponent } from "./user-settings.component";
1414
import { SharedScicatFrontendModule } from "shared/shared.module";
1515
import { Message, MessageType } from "state-management/models";
1616
import { showMessageAction } from "state-management/actions/user.actions";
17-
import { FlexLayoutModule } from "@angular/flex-layout";
17+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
1818
import { MatCardModule } from "@angular/material/card";
1919
import { MatIconModule } from "@angular/material/icon";
2020

src/app/users/users.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UserEffects } from "./../state-management/effects/user.effects";
22
import { EffectsModule } from "@ngrx/effects";
33
import { ADAuthService } from "./adauth.service";
44
import { CommonModule } from "@angular/common";
5-
import { FlexLayoutModule } from "@angular/flex-layout";
5+
import { FlexLayoutModule } from "@ngbracket/ngx-layout";
66
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
77
import { LoginComponent } from "users/login/login.component";
88
import { NgModule } from "@angular/core";

0 commit comments

Comments
 (0)