switch all FE to camelCase (#2576)

* switch all fe to camelCase * switch to camelCase on backend --------- Co-authored-by: Aiden McClelland <me@drbonez.dev>
2026-03-30 12:11:56 +00:00 · 2024-03-24 12:05:59 -06:00
parent b14646ebd9
commit c782bab296
173 changed files with 749 additions and 1901 deletions
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.html
+++ b/web/projects/ui/src/app/modals/app-config/app-config.page.html
@@ -9,7 +9,7 @@
  </ion-toolbar>
 </ion-header>

-<ion-content class="ion-padding" *ngIf="pkg['state-info'].manifest as manifest">
+<ion-content class="ion-padding" *ngIf="pkg.stateInfo.manifest as manifest">
  <!-- loading -->
  <text-spinner
    *ngIf="loading; else notLoading"
@@ -82,7 +82,7 @@
      </ion-item>

      <!-- no options -->
-      <ion-item *ngIf="!hasOptions">
+      <ion-item *ngIf="!hasConfig">
        <ion-label>
          <p>
            No config options for {{ manifest.title }} {{ manifest.version }}.
@@ -111,11 +111,7 @@
 <ion-footer>
  <ion-toolbar>
    <ng-container *ngIf="!loading && !loadingError">
-      <ion-buttons
-        *ngIf="configForm && hasOptions"
-        slot="start"
-        class="ion-padding-start"
-      >
+      <ion-buttons *ngIf="hasConfig" slot="start" class="ion-padding-start">
        <ion-button fill="clear" (click)="resetDefaults()">
          <ion-icon slot="start" name="refresh"></ion-icon>
          Reset Defaults
@@ -123,7 +119,7 @@
      </ion-buttons>
      <ion-buttons slot="end" class="ion-padding-end">
        <ion-button
-          *ngIf="configForm"
+          *ngIf="hasConfig"
          fill="solid"
          color="primary"
          [disabled]="saving"
@@ -134,7 +130,7 @@
          Save
        </ion-button>
        <ion-button
-          *ngIf="!configForm"
+          *ngIf="!hasConfig"
          fill="solid"
          color="dark"
          (click)="dismiss()"
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.ts
+++ b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
@@ -59,8 +59,6 @@ export class AppConfigPage {
  saving = false
  loadingError: string | IonicSafeString = ''

-  hasOptions = false
-
  constructor(
    private readonly embassyApi: ApiService,
    private readonly errToast: ErrorToastService,
@@ -71,6 +69,10 @@ export class AppConfigPage {
    private readonly patch: PatchDB<DataModel>,
  ) {}

+  get hasConfig() {
+    return this.pkg.stateInfo.manifest.hasConfig
+  }
+
  async ngOnInit() {
    try {
      const pkg = await getPackage(this.patch, this.pkgId)
@@ -78,7 +80,7 @@ export class AppConfigPage {

      this.pkg = pkg

-      if (!this.pkg['state-info'].manifest['has-config']) return
+      if (!this.hasConfig) return

      let newConfig: object | undefined
      let patch: Operation[] | undefined
@@ -86,12 +88,12 @@ export class AppConfigPage {
      if (this.dependentInfo) {
        this.loadingText = `Setting properties to accommodate ${this.dependentInfo.title}`
        const {
-          'old-config': oc,
-          'new-config': nc,
+          oldConfig: oc,
+          newConfig: nc,
          spec: s,
        } = await this.embassyApi.dryConfigureDependency({
-          'dependency-id': this.pkgId,
-          'dependent-id': this.dependentInfo.id,
+          dependencyId: this.pkgId,
+          dependentId: this.dependentInfo.id,
        })
        this.original = oc
        newConfig = nc
@@ -111,10 +113,6 @@ export class AppConfigPage {
        newConfig || this.original,
      )

-      this.hasOptions = !!Object.values(this.configSpec).find(
-        valSpec => valSpec.type !== 'pointer',
-      )
-
      if (patch) {
        this.diff = this.getDiff(patch)
        this.markDirty(patch)
--- a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
+++ b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
@@ -1,5 +1,5 @@
 <ng-container
-  *ngIf="packageData$ | toOptions : backupInfo['package-backups'] | async as options"
+  *ngIf="packageData$ | toOptions : backupInfo.packageBackups | async as options"
 >
  <ion-header>
    <ion-toolbar>
--- a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
@@ -23,7 +23,7 @@ export class AppRecoverSelectPage {
  @Input() password!: string
  @Input() oldPassword?: string

-  readonly packageData$ = this.patch.watch$('package-data').pipe(take(1))
+  readonly packageData$ = this.patch.watch$('packageData').pipe(take(1))

  hasSelection = false
  error: string | IonicSafeString = ''
@@ -53,8 +53,8 @@ export class AppRecoverSelectPage {
    try {
      await this.embassyApi.restorePackages({
        ids,
-        'target-id': this.id,
-        'old-password': this.oldPassword || null,
+        targetId: this.id,
+        oldPassword: this.oldPassword || null,
        password: this.password,
      })
      this.modalCtrl.dismiss(undefined, 'success')
--- a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
@@ -34,7 +34,7 @@ export class ToOptionsPipe implements PipeTransform {
            id,
            installed: !!packageData[id],
            checked: false,
-            'newer-eos': this.compare(packageBackups[id]['os-version']),
+            'newer-eos': this.compare(packageBackups[id].osVersion),
          }))
          .sort((a, b) =>
            b.title.toLowerCase() > a.title.toLowerCase() ? -1 : 1,
--- a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
+++ b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
@@ -29,7 +29,7 @@ export class BackupSelectPage {

  async ngOnInit() {
    this.pkgs = await firstValueFrom(
-      this.patch.watch$('package-data').pipe(
+      this.patch.watch$('packageData').pipe(
        map(pkgs => {
          return Object.values(pkgs)
            .map(pkg => {
@@ -38,7 +38,7 @@ export class BackupSelectPage {
                id,
                title,
                icon: pkg.icon,
-                disabled: pkg['state-info'].state !== PackageState.Installed,
+                disabled: pkg.stateInfo.state !== PackageState.Installed,
                checked: false,
              }
            })
--- a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
+++ b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
@@ -200,7 +200,7 @@ export class MarketplaceSettingsPage {
  ): Promise<void> {
    // Error on duplicates
    const hosts = await firstValueFrom(
-      this.patch.watch$('ui', 'marketplace', 'known-hosts'),
+      this.patch.watch$('ui', 'marketplace', 'knownHosts'),
    )
    const currentUrls = Object.keys(hosts).map(toUrl)
    if (currentUrls.includes(url)) throw new Error('marketplace already added')
@@ -217,7 +217,7 @@ export class MarketplaceSettingsPage {
    loader.message = 'Saving...'

    await this.api.setDbValue<{ name: string }>(
-      ['marketplace', 'known-hosts', url],
+      ['marketplace', 'knownHosts', url],
      { name },
    )
  }
@@ -229,7 +229,7 @@ export class MarketplaceSettingsPage {
    await loader.present()

    const hosts = await firstValueFrom(
-      this.patch.watch$('ui', 'marketplace', 'known-hosts'),
+      this.patch.watch$('ui', 'marketplace', 'knownHosts'),
    )

    const filtered: { [url: string]: UIStore } = Object.keys(hosts)
@@ -244,7 +244,7 @@ export class MarketplaceSettingsPage {

    try {
      await this.api.setDbValue<{ [url: string]: UIStore }>(
-        ['marketplace', 'known-hosts'],
+        ['marketplace', 'knownHosts'],
        filtered,
      )
    } catch (e: any) {
--- a/web/projects/ui/src/app/modals/os-update/os-update.page.ts
+++ b/web/projects/ui/src/app/modals/os-update/os-update.page.ts
@@ -22,7 +22,7 @@ export class OSUpdatePage {
  ) {}

  ngOnInit() {
-    const releaseNotes = this.eosService.eos?.['release-notes']!
+    const releaseNotes = this.eosService.eos?.releaseNotes!

    this.versions = Object.keys(releaseNotes)
      .sort()