feat(): temp update 4ps

mixcore · Dec 29, 2023 · ea37e86 · ea37e86 · vercel · Dec 29, 2023
1 parent f9e6453
commit ea37e86
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 91 deletions.
diff --git a/apps/mix-database/src/assets/images/mixcore-logo-square.svg b/apps/mix-database/src/assets/images/mixcore-logo-square.svg
diff --git a/apps/mix-database/src/assets/images/mixcore-logo.svg b/apps/mix-database/src/assets/images/mixcore-logo.svg
diff --git a/apps/mix-database/src/environments/environment.ts b/apps/mix-database/src/environments/environment.ts
@@ -1,5 +1,5 @@
 export const environment = {
   production: false,
-  domainUrl: 'https://dev.mixcore.org',
-  stageDomainUrl: 'https://dev.mixcore.org',
+  domainUrl: 'https://luffy.uat.4ps.dev',
+  stageDomainUrl: 'https://luffy.uat.4ps.dev/',
 };
diff --git a/apps/mix-database/src/favicon.ico b/apps/mix-database/src/favicon.ico
diff --git a/apps/mix-database/src/index.html b/apps/mix-database/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>DataVerse | Universal Database</title>
+    <title>4P's Back Office</title>
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />

diff --git a/libs/mix-lib/src/swagger/mix.swagger.ts b/libs/mix-lib/src/swagger/mix.swagger.ts
@@ -1,10 +1,10 @@
 export const MixSwagger = {
   auth: {
-    signIn: '/api/v2/rest/mix-account/user/login',
-    register: '/api/v2/rest/mix-account/user/register',
-    getProfile: '/api/v2/rest/mix-account/user/my-profile',
+    signIn: '/api/v2/rest/auth/user/login',
+    register: '/api/v2/rest/auth/user/register',
+    getProfile: '/api/v2/rest/auth/user/my-profile',
     culture: '/api/v2/rest/mix-portal/culture',
-    renewToken: '/api/v2/rest/mix-account/user/renew-token',
+    renewToken: '/api/v2/rest/auth/user/renew-token',
   },
   global: {
     globalSetting: '/api/v2/rest/shared/get-global-settings',
@@ -42,12 +42,12 @@ export const MixSwagger = {
     config: '/api/v2/rest/mix-portal/configuration',
   },
   user: {
-    list: '/api/v2/rest/mix-account/user/list',
-    detail: '/api/v2/rest/mix-account/user/details',
-    register: '/api/v2/rest/mix-account/user/register',
-    role: '/api/v2/rest/mix-account/role',
+    list: '/api/v2/rest/auth/user/list',
+    detail: '/api/v2/rest/auth/user/details',
+    register: '/api/v2/rest/auth/user/register',
+    role: '/api/v2/rest/auth/role',
     permission: '/api/v2/rest/mix-services/permission',
-    delete: '/api/v2/rest/mix-account/user/remove-user',
+    delete: '/api/v2/rest/auth/user/remove-user',
   },
   ecommerce: {
     updateDeliveryCode: '/api/v2/ecommerce/update-delivery-code',

diff --git a/.../modules/database/components/database-inline-select/database-inline-select.component.html b/.../modules/database/components/database-inline-select/database-inline-select.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="store.vm$ | async as vm">
+<ng-container *ngIf="state() as vm">
   <div class="database-inline-select"
        [tp]="dbSelect"
        [tpOffset]="[-10, 5]"

diff --git a/...rc/modules/database/components/database-inline-select/database-inline-select.component.ts b/...rc/modules/database/components/database-inline-select/database-inline-select.component.ts
@@ -5,12 +5,15 @@ import {
   EventEmitter,
   Input,
   Output,
+  effect,
   inject,
+  signal,
 } from '@angular/core';
 import { MixDatabase } from '@mixcore/lib/model';
-import { DatabaseStore } from '@mixcore/share/stores';
+import { BaseState } from '@mixcore/share/base';
 import { TippyDirective } from '@ngneat/helipopper';
 import { tuiPure } from '@taiga-ui/cdk';
+import { MasterDbStore } from '../../store/master-db.store';
 
 @Component({
   selector: 'mix-database-inline-select',
@@ -21,12 +24,27 @@ import { tuiPure } from '@taiga-ui/cdk';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DatabaseInlineSelectComponent {
-  public store = inject(DatabaseStore);
+  public store = inject(MasterDbStore);
+  public state = signal<BaseState<MixDatabase> | undefined>(undefined);
 
   @Input() public selectedItemId?: number;
   @Input() public selectedItemName?: string;
   @Output() public selectedItemChange = new EventEmitter<MixDatabase>();
 
+  constructor() {
+    effect(
+      () => {
+        const state = this.store.stateSignal();
+        this.state.set(state);
+      },
+      { allowSignalWrites: true }
+    );
+  }
+
+  ngOnInit() {
+    this.store.stateSignal();
+  }
+
   @tuiPure
   public getSelectedDbName(
     db: MixDatabase[],

diff --git a/libs/share-styles/src/styles/tippy.scss b/libs/share-styles/src/styles/tippy.scss
@@ -9,6 +9,7 @@
 
     .popup-container {
       max-height: 50vh;
+      min-width: 300px;
       overflow: auto;
 
       &::-webkit-scrollbar {