fix: improve theme export name, bump deps, improve package.json scrip…

…ts (#196)

Co-authored-by: Christian Badura <[email protected]>

.eslintrc.json

@@ -61,7 +61,7 @@
         ],
         "no-unused-vars": "off",
         "@typescript-eslint/no-unused-vars": ["error", { "vars": "all", "args": "none" }],
-        "@typescript-eslint/no-explicit-any": "warn",
+        "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/ban-types": [
           "error",
           {

.gitignore

@@ -34,6 +34,7 @@ speed-measure-plugin*.json
 # misc
 .angular/cache
 .sass-cache
+.eslintcache
 .gitlab*
 .scannerwork
 connect.lock

package.json

@@ -12,11 +12,11 @@
   },
   "scripts": {
     "build": "ng build",
-    "clean": "npm cache clean --force && npm run clean-angular",
+    "clean": "npm cache clean --force && npm run clean-angular && ng cache clean && rm .eslintcache",
     "clean-angular": "ng cache clean",
     "start": "ng serve --configuration=development --proxy-config=proxy.conf.js",
-    "prepare": "husky install",
-    "lint": "ng lint",
+    "prepare": "husky",
+    "lint": "ng lint --cache=true",
     "eslint": "eslint --quiet --ext .js,.ts src",
     "format": "ng lint --fix",
     "browsers": "npx browserslist",
@@ -57,13 +57,13 @@
     "@onecx/angular-accelerator": "^5.2.0",
     "@onecx/angular-auth": "^5.2.0",
     "@onecx/angular-integration-interface": "^5.2.0",
-    "@onecx/angular-remote-components": "^5.2.0",
+    "@onecx/angular-remote-components": "^5.3.0",
     "@onecx/angular-webcomponents": "^5.2.0",
-    "@onecx/angular-testing": "^5.2.0",
+    "@onecx/angular-testing": "^5.3.0",
     "@onecx/integration-interface": "^5.2.0",
     "@onecx/keycloak-auth": "^5.2.0",
     "@onecx/portal-integration-angular": "^5.2.0",
-    "@onecx/portal-layout-styles": "^5.2.0",
+    "@onecx/portal-layout-styles": "^5.3.0",
     "@webcomponents/webcomponentsjs": "^2.8.0",
     "file-saver": "^2.0.5",
     "i18n-iso-countries": "^7.11.3",

src/app/shared/utils.ts

@@ -47,3 +47,18 @@ export function prepareUrlPath(url?: string, path?: string): string {
 export function bffImageUrl(basePath: string | undefined, name: string | undefined, refType: RefType): string {
   return !name ? '' : basePath + '/images/' + name + '/' + refType
 }
+
+/**
+ * Date & time
+ */
+export function getCurrentDateTime(): string {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = String(now.getMonth() + 1).padStart(2, '0')
+  const day = String(now.getDate()).padStart(2, '0')
+  const hours = String(now.getHours()).padStart(2, '0')
+  const minutes = String(now.getMinutes()).padStart(2, '0')
+  const seconds = String(now.getSeconds()).padStart(2, '0')
+
+  return `${year}-${month}-${day}_${hours}${minutes}${seconds}`
+}

src/app/theme/theme-detail/theme-detail.component.spec.ts

@@ -13,7 +13,7 @@ import { ConfigurationService, PortalMessageService, UserService } from '@onecx/
 
 import { RefType, Theme, ThemesAPIService } from 'src/app/shared/generated'
 import { ThemeDetailComponent } from './theme-detail.component'
-import { bffImageUrl } from 'src/app/shared/utils'
+import { bffImageUrl, getCurrentDateTime } from 'src/app/shared/utils'
 
 describe('ThemeDetailComponent', () => {
   let component: ThemeDetailComponent
@@ -404,7 +404,10 @@ describe('ThemeDetailComponent', () => {
       null,
       2
     )
-    expect(FileSaver.saveAs).toHaveBeenCalledOnceWith(jasmine.any(Blob), 'themeName_Theme.json')
+    expect(FileSaver.saveAs).toHaveBeenCalledOnceWith(
+      jasmine.any(Blob),
+      `onecx-theme_themeName_${getCurrentDateTime()}.json`
+    )
   })
 
   it('should display error on theme export fail', () => {

src/app/theme/theme-detail/theme-detail.component.ts

@@ -6,7 +6,7 @@ import FileSaver from 'file-saver'
 
 import { Action, PortalMessageService, UserService } from '@onecx/portal-integration-angular'
 
-import { sortByLocale, bffImageUrl } from 'src/app/shared/utils'
+import { sortByLocale, bffImageUrl, getCurrentDateTime } from 'src/app/shared/utils'
 import {
   ExportThemeRequest,
   ImagesInternalAPIService,
@@ -164,7 +164,10 @@ export class ThemeDetailComponent implements OnInit {
         .subscribe({
           next: (data) => {
             const themeJSON = JSON.stringify(data, null, 2)
-            FileSaver.saveAs(new Blob([themeJSON], { type: 'text/json' }), `${this.theme?.name + '_Theme'}.json`)
+            FileSaver.saveAs(
+              new Blob([themeJSON], { type: 'text/json' }),
+              `onecx-theme_${this.theme?.name}_${getCurrentDateTime()}.json`
+            )
           },
           error: (err) => {
             console.log(err)