Rebase (#6088)

Signed-off-by: Alexander Platov <alexander.platov@hardcoreeng.com>
hcengineering · Jul 25, 2024 · 1329fb1 · 1329fb1
1 parent 75c125c
commit 1329fb1
Show file tree

Hide file tree

Showing 193 changed files with 2,391 additions and 1,726 deletions.
diff --git a/models/calendar/src/index.ts b/models/calendar/src/index.ts
@@ -259,7 +259,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: calendar.string.Calendar,
-      icon: calendar.icon.Calendar,
+      icon: calendar.icon.CalendarView,
       component: calendar.component.CalendarView
     },
     calendar.viewlet.Calendar

diff --git a/models/controlled-documents/src/index.ts b/models/controlled-documents/src/index.ts
@@ -181,6 +181,7 @@ export function createModel (builder: Builder): void {
               query: {
                 [documents.mixin.DocumentTemplate]: { $exists: false }
               },
+              icon: documents.icon.Library,
               title: documents.string.Documents,
               config: [
                 ['effective', documents.string.Effective, {}],

diff --git a/models/document/src/index.ts b/models/document/src/index.ts
@@ -533,6 +533,7 @@ function defineApplication (builder: Builder): void {
             component: workbench.component.SpecialView,
             componentProps: {
               _class: document.class.Teamspace,
+              icon: view.icon.List,
               label: document.string.Teamspaces
             },
             position: 'top'

diff --git a/models/drive/src/index.ts b/models/drive/src/index.ts
@@ -657,7 +657,7 @@ function defineApplication (builder: Builder): void {
     core.space.Model,
     {
       label: drive.string.Drive,
-      icon: drive.icon.Drive,
+      icon: drive.icon.DriveApplication,
       alias: driveId,
       hidden: false,
       locationResolver: drive.resolver.Location,
@@ -667,7 +667,7 @@ function defineApplication (builder: Builder): void {
             id: 'browser',
             accessLevel: AccountRole.User,
             label: drive.string.Drives,
-            icon: view.icon.List,
+            icon: drive.icon.Drives,
             component: workbench.component.SpecialView,
             componentProps: {
               _class: drive.class.Drive,

diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts
@@ -117,20 +117,21 @@ export function createModel (builder: Builder): void {
             accessLevel: AccountRole.User,
             componentProps: {
               _class: lead.mixin.Customer,
-              icon: lead.icon.Lead,
+              icon: contact.icon.Person,
               label: lead.string.Customers
             },
             position: 'top'
           },
           {
             id: 'funnels',
             component: workbench.component.SpecialView,
-            icon: view.icon.List,
+            icon: lead.icon.Funnels,
             label: lead.string.Funnels,
             position: 'bottom',
             accessLevel: AccountRole.User,
             componentProps: {
               _class: lead.class.Funnel,
+              icon: lead.icon.Funnels,
               label: lead.string.Funnels,
               createComponent: lead.component.CreateFunnel,
               createLabel: lead.string.CreateFunnel

diff --git a/models/love/src/index.ts b/models/love/src/index.ts
@@ -141,7 +141,6 @@ export function createModel (builder: Builder): void {
       alias: loveId,
       hidden: false,
       position: 'top',
-      modern: true,
       component: love.component.Main
     },
     love.app.Love

diff --git a/models/products/src/index.ts b/models/products/src/index.ts
@@ -455,6 +455,7 @@ function defineApplication (builder: Builder): void {
             component: workbench.component.SpecialView,
             componentProps: {
               _class: products.class.Product,
+              icon: products.icon.Product,
               label: products.string.Products
             },
             position: 'top'
@@ -466,6 +467,7 @@ function defineApplication (builder: Builder): void {
             component: workbench.component.SpecialView,
             componentProps: {
               _class: products.class.ProductVersion,
+              icon: products.icon.ProductVersion,
               label: products.string.ProductVersions
             },
             position: 'top'

diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts
@@ -226,6 +226,7 @@ export function createModel (builder: Builder): void {
             position: 'event',
             componentProps: {
               labelTasks: recruit.string.Applications,
+              icon: recruit.icon.AssignedToMe,
               _class: recruit.class.Applicant,
               config: [
                 ['assigned', view.string.Assigned, {}],

diff --git a/models/setting/src/index.ts b/models/setting/src/index.ts
@@ -349,8 +349,7 @@ export function createModel (builder: Builder): void {
       icon: setting.icon.Setting,
       alias: settingId,
       hidden: true,
-      component: setting.component.Settings,
-      modern: true
+      component: setting.component.Settings
     },
     setting.ids.SettingApp
   )

diff --git a/models/time/src/index.ts b/models/time/src/index.ts
@@ -197,7 +197,6 @@ export function createModel (builder: Builder): void {
       alias: timeId,
       hidden: false,
       position: 'top',
-      modern: true,
       component: time.component.Me
     },
     time.app.Me

diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
@@ -324,6 +324,7 @@ function defineApplication (
             icon: tracker.icon.MyIssues,
             component: tracker.component.MyIssues,
             componentProps: {
+              icon: tracker.icon.MyIssues,
               config: [
                 ['assigned', view.string.Assigned, {}],
                 ['active', tracker.string.Active, {}],
@@ -341,6 +342,7 @@ function defineApplication (
             component: tracker.component.Issues,
             componentProps: {
               space: undefined,
+              icon: tracker.icon.Issues,
               title: tracker.string.AllIssues,
               config: [
                 ['all', tracker.string.All, {}],
@@ -360,6 +362,7 @@ function defineApplication (
             spaceClass: tracker.class.Project,
             componentProps: {
               _class: tracker.class.Project,
+              icon: view.icon.List,
               label: tracker.string.AllProjects
             }
           }
@@ -380,6 +383,7 @@ function defineApplication (
                 icon: tracker.icon.Issues,
                 component: tracker.component.Issues,
                 componentProps: {
+                  icon: tracker.icon.Issues,
                   title: tracker.string.Issues,
                   config: [
                     ['all', tracker.string.All, {}],

diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte
@@ -45,9 +45,14 @@
   export let withoutContentScroll: boolean = false
   export let customAside: ButtonItem[] | undefined = undefined
   export let selectedAside: string | boolean = customAside ? customAside[0].id : isAside
-  export let kind: 'default' | 'modern' = 'default'
-  export let printHeader = true
-  export let printAside = false
+  export let printHeader: boolean = true
+  export let printAside: boolean = false
+  export let adaptive: 'default' | 'freezeActions' | 'doubleRow' | 'disabled' = 'disabled'
+  export let hideBefore: boolean = false
+  export let hideSearch: boolean = true
+  export let hideActions: boolean = false
+  export let hideExtra: boolean = false
+  export let overflowExtra: boolean = false
 
   export function getAside (): string | boolean {
     return panel.getAside()
@@ -115,13 +120,18 @@
   on:close
   {allowClose}
   {embedded}
-  {kind}
   {floatAside}
   bind:useMaxWidth
   {isFullSize}
   {customAside}
   {printHeader}
   {printAside}
+  {adaptive}
+  {hideBefore}
+  {hideSearch}
+  {hideActions}
+  {hideExtra}
+  {overflowExtra}
   bind:selectedAside
   on:select={(result) => {
     selectedAside = result.detail
@@ -144,7 +154,6 @@
   <svelte:fragment slot="utils">
     {#if isUtils && $$slots.utils}
       <slot name="utils" />
-      <div class="buttons-divider max-h-7 h-7 mx-2 no-print" />
     {/if}
   </svelte:fragment>
 
@@ -196,6 +205,10 @@
     <slot name="post-utils" />
   </svelte:fragment>
 
+  <svelte:fragment slot="extra">
+    <slot name="extra" />
+  </svelte:fragment>
+
   <svelte:fragment slot="page-header">
     <slot name="page-header" />
   </svelte:fragment>

diff --git a/packages/presentation/src/components/SpacesMultiPopup.svelte b/packages/presentation/src/components/SpacesMultiPopup.svelte
@@ -31,7 +31,6 @@
   import SpaceInfo from './SpaceInfo.svelte'
 
   export let _classes: Ref<Class<Space>>[] = []
-  export let allowDeselect: boolean = false
   export let titleDeselect: IntlString | undefined = undefined
   export let placeholder: IntlString = presentation.string.Search
   export let placeholderParam: any | undefined = undefined
@@ -100,26 +99,21 @@
     <div class="box">
       {#each shownSpaces as space}
         <button
-          class="menu-item"
+          class="menu-item justify-between"
           on:click={() => {
             checkSelected(space)
           }}
         >
-          <div class="check pointer-events-none">
-            <CheckBox checked={isSelected(space)} kind={'primary'} />
-          </div>
           <SpaceInfo size={'medium'} value={space} {iconWithEmoji} {defaultIcon} />
-          {#if allowDeselect && space._id === selected}
-            <div class="check pointer-events-none">
-              {#if titleDeselect}
-                <div class="clear-mins" use:tooltip={{ label: titleDeselect ?? presentation.string.Deselect }}>
-                  <CheckBox checked circle kind={'primary'} />
-                </div>
-              {:else}
-                <CheckBox checked circle kind={'primary'} />
-              {/if}
-            </div>
-          {/if}
+          <div class="check ml-0 pointer-events-none">
+            {#if titleDeselect}
+              <div class="clear-mins" use:tooltip={{ label: titleDeselect ?? presentation.string.Deselect }}>
+                <CheckBox checked={isSelected(space)} kind={'primary'} />
+              </div>
+            {:else}
+              <CheckBox checked={isSelected(space)} kind={'primary'} />
+            {/if}
+          </div>
         </button>
       {/each}
     </div>

diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
@@ -189,7 +189,7 @@ input.search {
 .inline-flex { display: inline-flex; }
 .flex-grow { flex-grow: 1; }
 .flex-no-shrink { flex-shrink: 0; }
-.flex-shrink { flex-shrink: 1; }
+.flex-shrink { flex-shrink: 1 !important; }
 .flex-wrap { flex-wrap: wrap !important; }
 .flex-nowrap { flex-wrap: nowrap !important; }
 .flex-baseline {
@@ -270,7 +270,7 @@ input.search {
   flex-direction: column;
   align-items: stretch;
 }
-.justify-between { justify-content: space-between; }
+.justify-between { justify-content: space-between !important; }
 .justify-start { justify-content: flex-start; }
 .justify-end { justify-content: flex-end !important; }
 .justify-center { justify-content: center; }
@@ -309,6 +309,7 @@ input.search {
   .icon {
     color: var(--theme-dark-color);
 
+    &.primary { color: var(--button-primary-BackgroundColor); }
     &.circle {
       padding: .25rem;
       background-color: var(--avatar-bg-color);
@@ -345,7 +346,11 @@ input.search {
     margin-left: .75rem;
   }
   &:hover {
-    .icon { color: var(--theme-caption-color); }
+    .icon {
+      color: var(--theme-caption-color);
+
+      &.primary { color: var(--button-primary-hover-BackgroundColor); }
+    }
     .label {
       color: var(--theme-caption-color);
 
@@ -483,6 +488,7 @@ input.search {
 }
 
 /* Margins & Paddings */
+.ml-0 { margin-left: 0 !important; }
 .ml-0-5 { margin-left: .125rem; }
 .ml-1 { margin-left: .25rem; }
 .ml-1-5 { margin-left: .375rem; }
@@ -508,6 +514,7 @@ input.search {
 .mr-8 { margin-right: 2rem; }
 .mr-10 { margin-right: 2.5rem; }
 .mr-32 { margin-right: 8rem }
+.mt--1 { margin-top: -.25rem; }
 .mt-0-5 { margin-top: .125rem; }
 .mt-1 { margin-top: .25rem; }
 .mt-2 { margin-top: .5rem; }
@@ -731,6 +738,7 @@ input.search {
 .min-h-9 { min-height: 2.25rem; }
 .min-h-11 { min-height: 2.75rem; }
 .min-h-12 { min-height: 3rem; }
+.min-h-13 { min-height: 3.25rem; }
 .min-h-16 { min-height: 4rem; }
 .min-h-30 { min-height: 7.5rem; }
 .min-h-60 { min-height: 15rem; }
@@ -958,6 +966,7 @@ a.no-line {
   &.bordered { border-color: var(--theme-button-border); }
 }
 
+.overflow-hidden { overflow: hidden; }
 .overflow-x-auto { overflow-x: auto; }
 .overflow-y-auto { overflow-y: auto; }
 .overflow-x-auto,

diff --git a/packages/theme/styles/_lumia-colors.scss b/packages/theme/styles/_lumia-colors.scss
@@ -53,6 +53,7 @@
   --global-popover-hover-BackgroundColor: #1F2737;
   --global-popover-BorderColor: #A5BDFF1A;
   --global-primary-LinkColor: #4D7FF5;
+  --global-primary-IconColor: #ffffff;
   --global-primary-TextColor: #FFFFFF;
   --global-secondary-TextColor: #C1C9D6;
   --global-tertiary-TextColor: #8E99AF;
@@ -66,6 +67,7 @@
   --global-higlight-Color: #F76E53;
   --global-accent-SkyText: #B9D1F5;
   --global-accent-BackgroundColor: #204DC8;
+  --global-on-nuance-TextColor: #041d7d;
 
   --global-no-priority-PriorityColor: #8E99AF;
   --global-low-PriorityColor: #6493FF;
@@ -147,6 +149,7 @@
   --global-popover-hover-BackgroundColor: #1F2737;
   --global-popover-BorderColor: #A5BDFF26;
   --global-primary-LinkColor: #3566E2;
+  --global-primary-IconColor: #0f121a;
   --global-primary-TextColor: #0F121A;
   --global-secondary-TextColor: #5A667E;
   --global-tertiary-TextColor: #7B879E;
@@ -160,6 +163,7 @@
   --global-higlight-Color: #F76E53;
   --global-accent-SkyText:#B9D1F5;
   --global-accent-BackgroundColor: #3566E2;
+  --global-on-nuance-TextColor: #2553cf;
 
   --global-no-priority-PriorityColor: #7B879E;
   --global-low-PriorityColor: #3566E2;

diff --git a/packages/theme/styles/button.scss b/packages/theme/styles/button.scss
@@ -84,7 +84,7 @@
 
   &:hover .btn-icon { color: var(--theme-caption-color); }
   &:not(.no-focus):focus {
-    &:not(.sh-filter) { box-shadow: 0 0 0 2px var(--primary-button-outline); }
+    &:not(.sh-filter, .regular) { box-shadow: 0 0 0 2px var(--primary-button-outline); }
     &.sh-filter { border-color: var(--primary-button-outline); }
   }
 
@@ -109,7 +109,8 @@
     &.pressed:hover { background-color: var(--theme-button-pressed); }
     &:focus {
       background-color: var(--theme-button-focused);
-      border-color: var(--theme-button-focused-border);
+      outline: 2px solid var(--global-focus-BorderColor);
+      outline-offset: 2px;
     }
     &:disabled { background-color: var(--theme-button-disabled); }
     &.selected {