Bump to angular 19

OpenBudget · Jan 5, 2025 · b7de120 · b7de120
1 parent 355e155
commit b7de120
Show file tree

Hide file tree

Showing 8 changed files with 7,991 additions and 6,472 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,19 +15,19 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.1.2",
-    "@angular/common": "^17.1.2",
-    "@angular/compiler": "^17.1.2",
-    "@angular/core": "^17.1.2",
-    "@angular/forms": "^17.1.2",
-    "@angular/platform-browser": "^17.1.2",
-    "@angular/platform-browser-dynamic": "^17.1.2",
-    "@angular/platform-server": "^17.1.2",
-    "@angular/router": "^17.1.2",
-    "@angular/ssr": "^17.1.2",
+    "@angular/animations": "^18.2.13",
+    "@angular/common": "^18.2.13",
+    "@angular/compiler": "^18.2.13",
+    "@angular/core": "^18.2.13",
+    "@angular/forms": "^18.2.13",
+    "@angular/platform-browser": "^18.2.13",
+    "@angular/platform-browser-dynamic": "^18.2.13",
+    "@angular/platform-server": "^18.2.13",
+    "@angular/router": "^18.2.13",
+    "@angular/ssr": "^18.2.12",
     "@avivharuzi/ngx-seo": "^16.0.0",
     "@ngneat/until-destroy": "^10.0.0",
-    "adamkey": "^0.2.3",
+    "adamkey": "^0.2.5",
     "d3-array": "^3.2.4",
     "d3-ease": "^3.0.1",
     "d3-hierarchy": "^3.1.2",
@@ -37,17 +37,17 @@
     "dayjs": "^1.11.9",
     "express": "^4.15.2",
     "memory-cache": "^0.2.0",
-    "mushonkey": "^0.3.3",
+    "mushonkey": "^0.3.4",
     "rxjs": "~7.8.0",
     "showdown": "^2.1.0",
     "tslib": "^2.3.0",
-    "zone.js": "~0.14.3"
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.1.2",
-    "@angular/cli": "~17.1.2",
-    "@angular/compiler-cli": "^17.1.2",
-    "@angular/localize": "^17.1.2",
+    "@angular-devkit/build-angular": "^18.2.12",
+    "@angular/cli": "~18.2.12",
+    "@angular/compiler-cli": "^18.2.13",
+    "@angular/localize": "^18.2.13",
     "@types/d3-array": "^3.0.6",
     "@types/d3-ease": "^3.0.0",
     "@types/d3-hierarchy": "^3.1.3",
@@ -57,7 +57,7 @@
     "@types/express": "^4.17.0",
     "@types/jasmine": "~4.3.0",
     "@types/memory-cache": "^0.2.3",
-    "@types/node": "^16.11.7",
+    "@types/node": "^16.18.123",
     "@types/plotly.js": "^2.12.26",
     "@types/showdown": "^2.0.2",
     "bootstrap": "^3.4.0",
@@ -69,6 +69,6 @@
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.3.3"
+    "typescript": "~5.5.4"
   }
-}
+}
diff --git a/projects/budgetkey/src/app/about/about.module.ts b/projects/budgetkey/src/app/about/about.module.ts
@@ -4,20 +4,14 @@ import { CommonModule } from '@angular/common';
 import { AboutRoutingModule } from './about-routing.module';
 import { AboutPageComponent } from './about-page/about-page.component';
 import { CommonComponentsModule } from '../common-components/common-components.module';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ListComponentsModule } from '../list-components/list-components.module';
 
 
-@NgModule({
-  declarations: [
-    AboutPageComponent
-  ],
-  imports: [
-    CommonModule,
-    CommonComponentsModule,
-    ListComponentsModule,
-    HttpClientModule,
-    AboutRoutingModule
-  ]
-})
+@NgModule({ declarations: [
+        AboutPageComponent
+    ], imports: [CommonModule,
+        CommonComponentsModule,
+        ListComponentsModule,
+        AboutRoutingModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
 export class AboutModule { }
diff --git a/projects/budgetkey/src/app/common-components/common-components.module.ts b/projects/budgetkey/src/app/common-components/common-components.module.ts
@@ -11,7 +11,7 @@ import { BkSubscriptionManager } from './components/subcsription-manager/bk-subs
 import { ModalComponent} from './components/modal/modal.component';
 
 import { ListsService } from './services/lists.service';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { GlobalSettingsService } from './global-settings.service';
 import { ClickOnReturnDirective } from './directives/click-on-return.directive';
 import { PlatformService } from './platform.service';
@@ -26,44 +26,38 @@ import { ShareWidgetComponent } from './components/share-widget/share-widget.com
 /**
  * Created by adam on 27/12/2016.
  */
-@NgModule({
-  imports: [
-    CommonModule,
-    HttpClientModule,
-    FormsModule,
-    RouterModule
-  ],
-  declarations: [
-    BkHeaderComponent,
-    BkFooterComponent,
-    BkSearchBar,
-    BkTooltipDirective,
-    BkSubscribeStar,
-    BkSubscriptionManager,
-    ModalComponent,
-    ClickOnReturnDirective,
-    AuthComponent,
-    ShareWidgetComponent,
-  ],
-  providers: [
-    ListsService,
-    GlobalSettingsService,
-    PlatformService,
-    AuthService,
-    SeoService,
-    LayoutService,
-    WindowService
-  ],
-  exports: [
-    BkHeaderComponent,
-    BkFooterComponent,
-    BkSearchBar,
-    BkTooltipDirective,
-    BkSubscribeStar,
-    BkSubscriptionManager,
-    ModalComponent,
-    ClickOnReturnDirective,
-    ShareWidgetComponent,
-  ]
-})
+@NgModule({ declarations: [
+        BkHeaderComponent,
+        BkFooterComponent,
+        BkSearchBar,
+        BkTooltipDirective,
+        BkSubscribeStar,
+        BkSubscriptionManager,
+        ModalComponent,
+        ClickOnReturnDirective,
+        AuthComponent,
+        ShareWidgetComponent,
+    ],
+    exports: [
+        BkHeaderComponent,
+        BkFooterComponent,
+        BkSearchBar,
+        BkTooltipDirective,
+        BkSubscribeStar,
+        BkSubscriptionManager,
+        ModalComponent,
+        ClickOnReturnDirective,
+        ShareWidgetComponent,
+    ], imports: [CommonModule,
+        FormsModule,
+        RouterModule], providers: [
+        ListsService,
+        GlobalSettingsService,
+        PlatformService,
+        AuthService,
+        SeoService,
+        LayoutService,
+        WindowService,
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 export class CommonComponentsModule { }
diff --git a/projects/budgetkey/src/app/item/item.module.ts b/projects/budgetkey/src/app/item/item.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { FormsModule } from '@angular/forms';
 import { CommonComponentsModule } from '../common-components/common-components.module';
 import { BudgetKeyItemService } from './budgetkey-item.service';
@@ -62,73 +62,67 @@ import { ListComponentsModule } from '../list-components/list-components.module'
 import { ItemPageHeaderComponent } from './item-page-header/item-page-header.component';
 import { ItemSoprocChartComponent } from './items/item-soproc/item-soproc-chart/item-soproc-chart.component';
 
-@NgModule({
-  declarations: [
-    BaseOrgItemComponent,
-    BaseSimpleItemComponent,
-    BudgetItemComponent,
-    ChartRouterComponent,
-    ContractPaymentsComponent,
-    IncomeItemComponent,
-    ItemAssociationComponent,
-    ItemBudget0digComponent,
-    ItemBudget2digComponent,
-    ItemBudget4digComponent,
-    ItemBudget6digComponent,
-    ItemBudget8digComponent,
-    ItemBudgetChangesComponent,
-    ItemBudgetFuncComponent,
-    ItemBudgetFuncDetailComponent,
-    ItemCallsForBidsComponent,
-    ItemCompanyComponent,
-    ItemContractComponent,
-    ItemIncome2digComponent,
-    ItemIncome4digComponent,
-    ItemIncome6digComponent,
-    ItemIncome8digComponent,
-    ItemLinkComponent,
-    ItemMuniBudgetComponent,
-    ItemMuniComponent,
-    ItemPageComponent,
-    ItemPeopleComponent,
-    ItemProcurementComponent,
-    ItemSupportCriteriaComponent,
-    ItemSupportsComponent,
-    ItemTenderComponent,
-    ItemVisualizationsComponent,
-    MuniBudgetLinkComponent,
-    MuniBudgetMinicardComponent,
-    MuniItemTidbitComponent,
-    SearchLinkComponent,
-    TimelinePartComponent,
-    ItemGovDecisionComponent,
-    ItemSocialServiceComponent,
-    ItemSocialServiceGovUnitComponent,
-    ItemSoprocChartComponent,
-    SocialServiceDataTableComponent,
-    MultiSelectComponent,
-    QuestionsPanelComponent,
-    ItemQuestionsComponent,
-    ItemQuestionsParameterComponent,
-    ItemDataTableComponent,
-    ChartVerticalLayoutComponent,
-    ItemNgoActivityReportComponent,
-    ItemNgoDistrictReportComponent,
-    ItemReportsComponent,
-    ItemPageHeaderComponent
-  ],
-  imports: [
-    CommonModule,
-    FormsModule,
-    HttpClientModule,
-    ItemRoutingModule,
-    CommonComponentsModule,
-    ListComponentsModule,
-    ChartsModule
-  ],
-  providers: [
-    ItemApiService,
-    BudgetKeyItemService,
-  ]
-})
+@NgModule({ declarations: [
+        BaseOrgItemComponent,
+        BaseSimpleItemComponent,
+        BudgetItemComponent,
+        ChartRouterComponent,
+        ContractPaymentsComponent,
+        IncomeItemComponent,
+        ItemAssociationComponent,
+        ItemBudget0digComponent,
+        ItemBudget2digComponent,
+        ItemBudget4digComponent,
+        ItemBudget6digComponent,
+        ItemBudget8digComponent,
+        ItemBudgetChangesComponent,
+        ItemBudgetFuncComponent,
+        ItemBudgetFuncDetailComponent,
+        ItemCallsForBidsComponent,
+        ItemCompanyComponent,
+        ItemContractComponent,
+        ItemIncome2digComponent,
+        ItemIncome4digComponent,
+        ItemIncome6digComponent,
+        ItemIncome8digComponent,
+        ItemLinkComponent,
+        ItemMuniBudgetComponent,
+        ItemMuniComponent,
+        ItemPageComponent,
+        ItemPeopleComponent,
+        ItemProcurementComponent,
+        ItemSupportCriteriaComponent,
+        ItemSupportsComponent,
+        ItemTenderComponent,
+        ItemVisualizationsComponent,
+        MuniBudgetLinkComponent,
+        MuniBudgetMinicardComponent,
+        MuniItemTidbitComponent,
+        SearchLinkComponent,
+        TimelinePartComponent,
+        ItemGovDecisionComponent,
+        ItemSocialServiceComponent,
+        ItemSocialServiceGovUnitComponent,
+        ItemSoprocChartComponent,
+        SocialServiceDataTableComponent,
+        MultiSelectComponent,
+        QuestionsPanelComponent,
+        ItemQuestionsComponent,
+        ItemQuestionsParameterComponent,
+        ItemDataTableComponent,
+        ChartVerticalLayoutComponent,
+        ItemNgoActivityReportComponent,
+        ItemNgoDistrictReportComponent,
+        ItemReportsComponent,
+        ItemPageHeaderComponent
+    ], imports: [CommonModule,
+        FormsModule,
+        ItemRoutingModule,
+        CommonComponentsModule,
+        ListComponentsModule,
+        ChartsModule], providers: [
+        ItemApiService,
+        BudgetKeyItemService,
+        provideHttpClient(withInterceptorsFromDi()),
+    ] })
 export class ItemModule { }
diff --git a/projects/budgetkey/src/app/item/items/item-budget-changes/item-budget-changes.component.html b/projects/budgetkey/src/app/item/items/item-budget-changes/item-budget-changes.component.html
@@ -37,13 +37,23 @@
             {{ item.change_type_name[0] }}
         </div>
 
+        @if (item.committee_id?.length > 0) {
         <div>
             <label class="field-label">
                 מספרי הפניה:
             </label>
             {{ item.committee_id.join(', ') }}
         </div>
-
+        }
+        @if (item.transaction_id) {
+        <div>
+            <label class="field-label">
+                מזהה הבקשה:
+            </label>
+            {{ item.transaction_id }}
+        </div>
+        }
+
         <ng-container *ngIf='item.explanation'>
             <label class="field-label">
                 דברי ההסבר להעברה: