Skip to content
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.

Sign up for GitHub

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

Jump to bottom

update script for deploy #1367

Closed
wants to merge 3 commits into from
Closed

update script for deploy #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1225417
Add --aot check for the --build-optimizer in deploy command in packag…
rajnikantsolarwinds Jul 29, 2022
709b04d
Modified the production deployment script
rajnikantsolarwinds Aug 5, 2022
fcfca60
Merge branch 'master-3.0' into bugfix/1366
grossmj Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"stylenames",
"source-map-js"
],
"outputPath": "dist",
"baseHref": "/static/web-ui/",
"outputPath": "dist/static/web-ui/",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
Expand Down Expand Up @@ -60,7 +61,13 @@
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}],
"optimization": true,
"optimization": {
"scripts": false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to deactivate the scripts optimization, not sure this is what we should do since it's kinda ignoring to original issue.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello. Implementing the changes here, I verified that running the server and accessing the IP of the host where the Web UI runs, it is not possible to add remote servers. Do you know what can cause this? Grateful!

"styles": {
"minify": true,
"inlineCritical": false
}
},
"outputHashing": "all",
"sourceMap": {
"hidden": true,
Expand Down
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"start": "ng serve",
"startforelectron": "ng serve --configuration=electronDev",
"build": "ng build",
"buildforproduction": "ng build --source-map=false --configuration=production --base-href /static/web-ui/",
"buildforproduction": "ng build --source-map=false --build-optimizer=true --aot --configuration=production --base-href /static/web-ui/",
"buildforelectron": "ng build --configuration=electronProd",
"buildforgithub": "ng build --configuration=githubProd",
"test": "ng test",
Expand Down Expand Up @@ -131,6 +131,9 @@
"webpack": "^5.72.0",
"yarn-upgrade-all": "^0.7.1"
},
"resolutions": {
"autoprefixer": "10.4.5"
},
"greenkeeper": {
"ignore": [
"typescript"
Expand Down
2 changes: 2 additions & 0 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ import { UploadingProcessbarComponent } from './common/uploading-processbar/uplo
import { ExportPortableProjectComponent } from './components/export-portable-project/export-portable-project.component';
import { NodesMenuConfirmationDialogComponent } from './components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component';
import { ConfirmationDeleteAllProjectsComponent } from './components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component';
import { APP_BASE_HREF } from '@angular/common';
import { ProjectMapLockConfirmationDialogComponent } from './components/project-map/project-map-menu/project-map-lock-confirmation-dialog/project-map-lock-confirmation-dialog.component';

@NgModule({
Expand Down Expand Up @@ -593,6 +594,7 @@ import { ProjectMapLockConfirmationDialogComponent } from './components/project-
SettingsService,
{provide: ErrorHandler, useClass: ToasterErrorHandler},
{provide: HTTP_INTERCEPTORS, useClass: HttpRequestsInterceptor, multi: true},
{provide: APP_BASE_HREF, useValue: '/static/web-ui'},
D3Service,
VersionService,
ProjectService,
Expand Down
13 changes: 6 additions & 7 deletions src/app/components/image-manager/image-manager.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,16 @@ <h1>Image Manager</h1>
<div class="mat-elevation-z8">
<mat-table #table [dataSource]="dataSource">
<ng-container matColumnDef="select">
<mat-header-cell *matHeaderCellDef>
<mat-header-cell class="mat-cell-width" *matHeaderCellDef>
<mat-checkbox (change)="$event ? selectAllImages() : null" [checked]="selection.hasValue() && isAllSelected()"
[indeterminate]="selection.hasValue() && !isAllSelected()">
</mat-checkbox>
</mat-header-cell>
<mat-cell *matCellDef="let row">
<mat-cell *matCellDef="let row" class="mat-cell-width">
<mat-checkbox (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null"
[checked]="selection.isSelected(row)">
</mat-checkbox>
</mat-cell>

</ng-container>

<ng-container matColumnDef="filename">
Expand All @@ -41,8 +40,8 @@ <h1>Image Manager</h1>
</ng-container>

<ng-container matColumnDef="image_type">
<mat-header-cell *matHeaderCellDef> Image Type </mat-header-cell>
<mat-cell *matCellDef="let row"> {{ row.image_type }} </mat-cell>
<mat-header-cell *matHeaderCellDef class="mat-cell-img-type-width"> Image Type </mat-header-cell>
<mat-cell *matCellDef="let row" class="mat-cell-img-type-width"> {{ row.image_type }} </mat-cell>
</ng-container>

<ng-container matColumnDef="image_size">
Expand All @@ -51,12 +50,12 @@ <h1>Image Manager</h1>
</ng-container>

<ng-container matColumnDef="delete" >
<mat-header-cell *matHeaderCellDef>
<mat-header-cell *matHeaderCellDef class="mat-cell-width">
<button mat-button *ngIf="(selection.hasValue() && isAllSelected()) || selection.selected.length > 1" (click)="deleteAllFiles()" aria-label="Example icon button with a delete icon">
<mat-icon>delete</mat-icon>
</button>
</mat-header-cell>
<mat-cell *matCellDef="let row" >
<mat-cell *matCellDef="let row" class="mat-cell-width">
<button mat-button *ngIf="selection.isSelected(row)" (click)="deleteFile(row.path)" aria-label="Example icon button with a delete icon">
<mat-icon>delete</mat-icon>
</button>
Expand Down
15 changes: 15 additions & 0 deletions src/app/components/image-manager/image-manager.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,19 @@ mat-cell, mat-header-cell, mat-footer-cell {
min-height: inherit;
}

.mat-cell-width{
max-width: 60px;

}
.mat-cell-img-type-width{
max-width: 110px;

}

.mat-cell-file-name-width{
justify-content: left;
margin-left: 10px;

}