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

NIFI-12902: Migrating to @angular-devkit/build-angular:application #8507

Merged
merged 2 commits into from
Mar 15, 2024
Merged

NIFI-12902: Migrating to @angular-devkit/build-angular:application #8507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddc2d49
NIFI-12902:
mcgilman Mar 14, 2024
536dde0
NIFI-12902:
mcgilman Mar 15, 2024
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
7 changes: 2 additions & 5 deletions ...ifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/nifi",
"index": "src/index.html",
"main": "src/main.ts",
"browser": "src/main.ts",
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
Expand All @@ -38,13 +38,10 @@
}
],
"outputHashing": "all",
"buildOptimizer": false,
"optimization": true
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true,
Expand Down
18 changes: 12 additions & 6 deletions ...ramework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion ...ifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
"@angular/platform-browser-dynamic": "^17.1.3",
"@angular/router": "^17.1.3",
"@ctrl/ngx-codemirror": "^7.0.0",
"@fontsource/roboto": "^5.0.12",
"@fontsource/roboto-slab": "^5.0.19",
"@ngrx/effects": "^17.1.0",
"@ngrx/router-store": "^17.1.0",
"@ngrx/store": "^17.1.0",
Expand All @@ -37,7 +39,6 @@
"humanize-duration": "^3.31.0",
"ngrx-immer": "^2.1.1",
"ngx-skeleton-loader": "^8.1.0",
"roboto-fontface": "0.10.0",
"rxjs": "~7.8.1",
"tslib": "^2.6.2",
"webfontloader": "^1.6.28",
Expand Down
18 changes: 17 additions & 1 deletion ...framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/proxy.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,25 @@ const target = {
changeOrigin: true,
headers: {
'X-ProxyPort': 4200
},
configure: (proxy, _options) => {
proxy.on('error', (err, _req, _res) => {
console.log('proxy error', err);
});
proxy.on('proxyReq', (proxyReq, req, _res) => {
console.log('Sending Request to the Target:', req.method, req.url);
});
proxy.on('proxyRes', (proxyRes, req, _res) => {
console.log('Received Response from the Target:', proxyRes.statusCode, req.url);
});
},
bypass: function(req, res, proxyOptions) {
if (req.url.startsWith('/nifi/')) {
return req.url;
}
}
};

export default {
'/': target
'/**': target
};
3 changes: 1 addition & 2 deletions ...c/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,7 @@ export class ProvenanceEventListingEffects {
panelClass: 'large-dialog'
});

dialogReference.componentInstance.contentViewerAvailable =
about?.contentViewerUrl != null ?? false;
dialogReference.componentInstance.contentViewerAvailable = about?.contentViewerUrl != null;

dialogReference.componentInstance.downloadContent
.pipe(takeUntil(dialogReference.afterClosed()))
Expand Down
2 changes: 1 addition & 1 deletion ...b-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export class QueueListingEffects {
panelClass: 'large-dialog'
});

dialogReference.componentInstance.contentViewerAvailable = about?.contentViewerUrl != null ?? false;
dialogReference.componentInstance.contentViewerAvailable = about?.contentViewerUrl != null;

dialogReference.componentInstance.downloadContent
.pipe(takeUntil(dialogReference.afterClosed()))
Expand Down
2 changes: 1 addition & 1 deletion ...ntend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

.parameter-name {
font-weight: bold;
font-weight: 700;
font-family: monospace;
font-size: 16px;
margin-bottom: 10px;
Expand Down
92 changes: 4 additions & 88 deletions ...-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@
@use 'app/ui/common/component-context/component-context.component-theme' as component-context;

// Plus imports for other components in your app.
@use 'roboto-fontface/css/roboto/roboto-fontface.css';
@use '@fontsource/roboto/latin.css' as roboto-normal;
@use '@fontsource/roboto/latin-300-italic.css' as roboto-light-italic;
@use '@fontsource/roboto/latin-400-italic.css' as roboto-normal-italic;
@use '@fontsource/roboto-slab/latin.css' as roboto-slab-normal;
@use 'assets/fonts/flowfont/flowfont.css';
@use 'font-awesome/css/font-awesome.min.css';
@use 'codemirror/lib/codemirror.css';
Expand All @@ -78,93 +81,6 @@
// To override the NiFi theme, you need to set the variables $material-theme-light and $material-theme-dark
@import 'assets/themes/nifi';

$fontPrimary: 'Roboto', sans-serif;
$fontSecondary: 'Robot Slab', sans-serif;
$fontMedium: 'Roboto Medium', sans-serif;
$fontLight: 'Roboto Light', sans-serif;

$appFontPath: '~roboto-fontface/fonts';

@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src:
local('Roboto Light'),
local('Roboto-Light'),
url('#{$appFontPath}/roboto/Roboto-Light.woff2') format('woff2');
}

@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 300;
src:
local('Roboto LightItalic'),
local('Roboto-LightItalic'),
url('#{$appFontPath}/roboto/Roboto-LightItalic.woff2') format('woff2');
}

@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: normal;
src:
local('Roboto Regular'),
local('Roboto-Regular'),
url('#{$appFontPath}/roboto/Roboto-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src:
local('Roboto Medium'),
local('Roboto-Medium'),
url('#{$appFontPath}/roboto/Roboto-Medium.woff2') format('woff2');
}

@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: bold;
src:
local('Roboto Bold'),
local('Roboto-Bold'),
url('#{$appFontPath}/roboto/Roboto-Bold.woff2') format('woff2');
}

@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: normal;
src:
local('Roboto Italic'),
local('Roboto-Italic'),
url('#{$appFontPath}/roboto/Roboto-RegularItalic.woff2') format('woff2');
}

@font-face {
font-family: 'Roboto Slab';
font-style: normal;
font-weight: normal;
src:
local('RobotoSlab Regular'),
local('RobotoSlab-Regular'),
url('#{$appFontPath}/roboto-slab/Roboto-Slab-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'Roboto Slab';
font-style: normal;
font-weight: bold;
src:
local('RobotoSlab Bold'),
local('RobotoSlab-Bold'),
url('#{$appFontPath}/roboto-slab/Roboto-Slab-Bold.woff2') format('woff2');
}

// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
Expand Down
Loading