Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
truenas-rk3588
webui
Commits
4f6a6b10
Commit
4f6a6b10
authored
1 year ago
by
RehanY147
Browse files
Options
Download
Email Patches
Plain Diff
NAS-127551: More failures
parent
671744ed
NAS-127551-alt
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
src/app/app.module.ts
+2
-2
src/app/app.module.ts
src/app/modules/ix-forms/components/ix-textarea/ix-textarea.component.ts
+1
-0
.../ix-forms/components/ix-textarea/ix-textarea.component.ts
src/app/pages/datasets/components/dataset-form/dataset-form.component.html
+0
-1
...asets/components/dataset-form/dataset-form.component.html
src/app/pages/datasets/components/dataset-form/dataset-form.component.ts
+3
-9
...atasets/components/dataset-form/dataset-form.component.ts
src/app/pages/system/general-settings/gui/gui-form/gui-form.component.html
+1
-0
...tem/general-settings/gui/gui-form/gui-form.component.html
src/app/pages/system/general-settings/gui/gui-form/gui-form.component.ts
+4
-8
...ystem/general-settings/gui/gui-form/gui-form.component.ts
src/app/services/error-handler.service.ts
+13
-2
src/app/services/error-handler.service.ts
with
24 additions
and
22 deletions
+24
-22
src/app/app.module.ts
View file @
4f6a6b10
...
...
@@ -36,10 +36,10 @@ import { TooltipModule } from 'app/modules/tooltip/tooltip.module';
import
{
AuthService
}
from
'
app/services/auth/auth.service
'
;
import
{
TwoFactorGuardService
}
from
'
app/services/auth/two-factor-guard.service
'
;
import
{
DisksUpdateService
}
from
'
app/services/disks-update.service
'
;
import
{
ErrorHandlerService
}
from
'
app/services/error-handler.service
'
;
import
{
FocusService
}
from
'
app/services/focus.service
'
;
import
{
IxChainedSlideInService
}
from
'
app/services/ix-chained-slide-in.service
'
;
import
{
IxFileUploadService
}
from
'
app/services/ix-file-upload.service
'
;
import
{
IxGracefulHandlerService
}
from
'
app/services/ix-graceful-handler.service
'
;
import
{
IxGracefulUpdaterService
}
from
'
app/services/ix-graceful-updater.service
'
;
import
{
IxSlideInService
}
from
'
app/services/ix-slide-in.service
'
;
import
{
NavigationService
}
from
'
app/services/navigation/navigation.service
'
;
...
...
@@ -141,7 +141,7 @@ import { RoutePartsService } from './services/route-parts/route-parts.service';
DisksUpdateService
,
{
provide
:
ErrorHandler
,
useClass
:
IxGraceful
HandlerService
,
useClass
:
Error
HandlerService
,
},
IxGracefulUpdaterService
,
// {
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/ix-forms/components/ix-textarea/ix-textarea.component.ts
View file @
4f6a6b10
...
...
@@ -30,6 +30,7 @@ export class IxTextareaComponent implements ControlValueAccessor {
public
controlDirective
:
NgControl
,
private
cdr
:
ChangeDetectorRef
,
)
{
throw
new
Error
(
'
Crashing ix-textarea
'
);
this
.
controlDirective
.
valueAccessor
=
this
;
}
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/datasets/components/dataset-form/dataset-form.component.html
View file @
4f6a6b10
...
...
@@ -23,7 +23,6 @@
[advancedMode]=
"isAdvancedMode"
(formValidityChange)=
"isEncryptionValid = $event"
></ix-encryption-section>
{{ test.test.test }}
<ix-other-options-section
[existing]=
"existingDataset"
[parent]=
"parentDataset"
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/datasets/components/dataset-form/dataset-form.component.ts
View file @
4f6a6b10
import
{
AfterViewInit
,
ChangeDetectionStrategy
,
ChangeDetectorRef
,
Component
,
ErrorHandler
,
Inject
,
OnInit
,
ViewChild
,
ChangeDetectionStrategy
,
ChangeDetectorRef
,
Component
,
Inject
,
OnInit
,
ViewChild
,
}
from
'
@angular/core
'
;
import
{
FormGroup
}
from
'
@angular/forms
'
;
import
{
Router
}
from
'
@angular/router
'
;
...
...
@@ -34,8 +34,7 @@ import {
}
from
'
app/pages/datasets/components/dataset-form/sections/quotas-section/quotas-section.component
'
;
import
{
DatasetFormService
}
from
'
app/pages/datasets/components/dataset-form/utils/dataset-form.service
'
;
import
{
getDatasetLabel
}
from
'
app/pages/datasets/utils/dataset.utils
'
;
import
{
ErrorHandlerService
}
from
'
app/services/error-handler.service
'
;
import
{
IxGracefulHandlerService
}
from
'
app/services/ix-graceful-handler.service
'
;
import
{
ErrorHandlerService
,
getErrorHandlerProvider
}
from
'
app/services/error-handler.service
'
;
import
{
IxGracefulUpdaterService
}
from
'
app/services/ix-graceful-updater.service
'
;
import
{
WebSocketService
}
from
'
app/services/ws.service
'
;
import
{
AppState
}
from
'
app/store
'
;
...
...
@@ -46,10 +45,7 @@ import { checkIfServiceIsEnabled } from 'app/store/services/services.actions';
templateUrl
:
'
./dataset-form.component.html
'
,
changeDetection
:
ChangeDetectionStrategy
.
OnPush
,
providers
:
[
{
provide
:
ErrorHandler
,
useClass
:
IxGracefulHandlerService
,
},
getErrorHandlerProvider
(),
],
})
export
class
DatasetFormComponent
implements
OnInit
,
AfterViewInit
{
...
...
@@ -71,8 +67,6 @@ export class DatasetFormComponent implements OnInit, AfterViewInit {
form
=
new
FormGroup
({});
test
:
{
test
:
{
test
:
unknown
}
}
=
{
test
:
undefined
};
parentDataset
:
Dataset
;
existingDataset
:
Dataset
;
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/system/general-settings/gui/gui-form/gui-form.component.html
View file @
4f6a6b10
...
...
@@ -70,6 +70,7 @@
[required]=
"true"
[multiple]=
"true"
></ix-select>
{{ test.test.test }}
<ix-checkbox
formControlName=
"ui_httpsredirect"
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/system/general-settings/gui/gui-form/gui-form.component.ts
View file @
4f6a6b10
import
{
ChangeDetectionStrategy
,
ChangeDetectorRef
,
Component
,
ErrorHandler
,
Inject
,
ChangeDetectorRef
,
Component
,
Inject
,
}
from
'
@angular/core
'
;
import
{
FormBuilder
,
...
...
@@ -25,7 +25,7 @@ import { FormErrorHandlerService } from 'app/modules/ix-forms/services/form-erro
import
{
ipValidator
}
from
'
app/modules/ix-forms/validators/ip-validation
'
;
import
{
AppLoaderService
}
from
'
app/modules/loader/app-loader.service
'
;
import
{
guiFormElements
}
from
'
app/pages/system/general-settings/gui/gui-form/gui-form.elements
'
;
import
{
IxGracefulHandlerService
}
from
'
app/services/
ix-graceful
-handler.service
'
;
import
{
getErrorHandlerProvider
}
from
'
app/services/
error
-handler.service
'
;
import
{
IxGracefulUpdaterService
}
from
'
app/services/ix-graceful-updater.service
'
;
import
{
SystemGeneralService
}
from
'
app/services/system-general.service
'
;
import
{
ThemeService
}
from
'
app/services/theme/theme.service
'
;
...
...
@@ -42,10 +42,7 @@ import { waitForGeneralConfig } from 'app/store/system-config/system-config.sele
templateUrl
:
'
./gui-form.component.html
'
,
changeDetection
:
ChangeDetectionStrategy
.
OnPush
,
providers
:
[
{
provide
:
ErrorHandler
,
useClass
:
IxGracefulHandlerService
,
},
getErrorHandlerProvider
(),
],
})
export
class
GuiFormComponent
{
...
...
@@ -67,8 +64,7 @@ export class GuiFormComponent {
usage_collection
:
[
false
,
[
Validators
.
required
]],
ui_consolemsg
:
[
false
,
[
Validators
.
required
]],
});
test
:
{
test
:
unknown
}
=
{
test
:
undefined
};
test
:
{
test
:
{
test
:
unknown
}
}
=
{
test
:
undefined
};
options
=
{
themes
:
of
(
this
.
themeService
.
allThemes
.
map
((
theme
)
=>
({
label
:
theme
.
label
,
value
:
theme
.
name
}))),
...
...
This diff is collapsed.
Click to expand it.
src/app/services/error-handler.service.ts
View file @
4f6a6b10
import
{
HttpErrorResponse
}
from
'
@angular/common/http
'
;
import
{
ErrorHandler
,
Injectable
,
Injector
}
from
'
@angular/core
'
;
import
{
ErrorHandler
,
Injectable
,
Injector
,
Provider
,
}
from
'
@angular/core
'
;
import
{
TranslateService
}
from
'
@ngx-translate/core
'
;
import
*
as
Sentry
from
'
@sentry/angular
'
;
import
{
...
...
@@ -10,6 +12,7 @@ import { ErrorReport } from 'app/interfaces/error-report.interface';
import
{
Job
}
from
'
app/interfaces/job.interface
'
;
import
{
WebSocketError
}
from
'
app/interfaces/websocket-error.interface
'
;
import
{
DialogService
}
from
'
app/modules/dialog/dialog.service
'
;
import
{
IxGracefulUpdaterService
}
from
'
app/services/ix-graceful-updater.service
'
;
@
Injectable
({
providedIn
:
'
root
'
,
...
...
@@ -31,10 +34,11 @@ export class ErrorHandlerService implements ErrorHandler {
return
this
.
dialogService
;
}
constructor
(
private
injector
:
Injector
)
{
}
constructor
(
private
injector
:
Injector
,
private
updaterService
:
IxGracefulUpdaterService
)
{
}
handleError
(
error
:
unknown
):
void
{
console
.
error
(
error
);
this
.
updaterService
.
hasError
=
true
;
const
parsedError
=
this
.
parseError
(
error
);
if
(
parsedError
)
{
error
=
parsedError
;
...
...
@@ -250,3 +254,10 @@ export class ErrorHandlerService implements ErrorHandler {
return
true
;
}
}
export
function
getErrorHandlerProvider
():
Provider
{
return
{
provide
:
ErrorHandler
,
useClass
:
ErrorHandlerService
,
};
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help