diff --git a/src/app/enums/catalog-app-state.enum.ts b/src/app/enums/catalog-app-state.enum.ts index a78a2ac9bd3..fd71b5bf1f3 100644 --- a/src/app/enums/catalog-app-state.enum.ts +++ b/src/app/enums/catalog-app-state.enum.ts @@ -3,11 +3,13 @@ export enum CatalogAppState { Deploying = 'DEPLOYING', Stopped = 'STOPPED', Crashed = 'CRASHED', + Stopping = 'STOPPING', } export const appStateIcons = new Map([ [CatalogAppState.Running, 'mdi-check-circle'], [CatalogAppState.Deploying, 'mdi-progress-wrench'], + [CatalogAppState.Stopping, 'mdi-progress-wrench'], [CatalogAppState.Stopped, 'mdi-stop-circle'], [CatalogAppState.Crashed, 'mdi-alert-circle'], ]); diff --git a/src/app/helptext/sharing/smb/smb.ts b/src/app/helptext/sharing/smb/smb.ts index 094cd704483..223a1a21684 100644 --- a/src/app/helptext/sharing/smb/smb.ts +++ b/src/app/helptext/sharing/smb/smb.ts @@ -177,6 +177,9 @@ export const helptextSharingSmb = { a list of supported macros. The connectpath **must** be preset before a client connects.', ), + placeholder_auxsmbconf: T('Additional Parameters String'), + tooltip_auxsmbconf: T('String of additional smb4.conf parameters not covered by the system\'s API.'), + actions_basic_mode: T('Basic Mode'), actions_advanced_mode: T('Advanced Mode'), diff --git a/src/app/interfaces/smb-share.interface.ts b/src/app/interfaces/smb-share.interface.ts index 0d147db14f7..d73f688434c 100644 --- a/src/app/interfaces/smb-share.interface.ts +++ b/src/app/interfaces/smb-share.interface.ts @@ -20,6 +20,7 @@ export interface SmbShare { name: string; path: string; path_suffix: string; + auxsmbconf: string; purpose: SmbPresetType; recyclebin: boolean; ro: boolean; diff --git a/src/app/pages/apps/components/installed-apps/installed-apps.component.ts b/src/app/pages/apps/components/installed-apps/installed-apps.component.ts index 9336b130981..ce67400787d 100644 --- a/src/app/pages/apps/components/installed-apps/installed-apps.component.ts +++ b/src/app/pages/apps/components/installed-apps/installed-apps.component.ts @@ -19,7 +19,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { - combineLatest, filter, finalize, + combineLatest, filter, Observable, } from 'rxjs'; import { CatalogAppState } from 'app/enums/catalog-app-state.enum'; @@ -324,10 +324,8 @@ export class InstalledAppsComponent implements OnInit, AfterViewInit { } stop(name: string): void { - this.loader.open(this.translate.instant('Stopping "{app}"', { app: name })); this.appService.stopApplication(name) .pipe( - finalize(() => this.loader.close()), this.errorHandler.catchError(), untilDestroyed(this), ) diff --git a/src/app/pages/apps/components/select-pool-dialog/select-pool-dialog.component.html b/src/app/pages/apps/components/select-pool-dialog/select-pool-dialog.component.html index 1d4d9bcc86e..781b88f7a34 100644 --- a/src/app/pages/apps/components/select-pool-dialog/select-pool-dialog.component.html +++ b/src/app/pages/apps/components/select-pool-dialog/select-pool-dialog.component.html @@ -9,13 +9,6 @@

[options]="pools$" > - @if (canMigrateApplications) { - - } -