Merge remote-tracking branch 'origin/main' into feature/dev-4380-form…

…-for-creating-a-new-segment-is-in-the-center-instead-on
dasch-swiss · Dec 2, 2024 · da4f00b · da4f00b
2 parents 923f1e7 + f6cf8d6
commit da4f00b
Show file tree

Hide file tree

Showing 241 changed files with 12,104 additions and 12,132 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,6 +5,7 @@ version: 2
 updates:
   - package-ecosystem: "npm"
     directory: "/"
+    open-pull-requests-limit: 10
     schedule:
       interval: "daily"
     commit-message:
@@ -18,6 +19,8 @@ updates:
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
+      - dependency-name: "ckeditor5-custom-build"
+      # we use  github:dasch-swiss/ckeditor_custom_build#v2.0.0 and v2.0.1 seems to be broken
 
   - package-ecosystem: "docker"
     directory: "/"

diff --git a/apps/dsp-app/cypress/e2e/project-member/resource-basic-member.cy.ts b/apps/dsp-app/cypress/e2e/project-member/resource-basic-member.cy.ts
@@ -1,4 +1,4 @@
-import { UploadedFileResponse } from '@dasch-swiss/vre/shared/app-representations';
+import { UploadedFileResponse } from '@dasch-swiss/vre/resource-editor/representations';
 import { faker } from '@faker-js/faker';
 import { ThingPictureClass } from '../../models/existing-data-models';
 import { UserProfiles } from '../../models/user-profiles';
@@ -78,7 +78,7 @@ describe('Check project admin existing resource functionality', () => {
     cy.url().should('match', regex);
   });
 
-  it('ThingPicture resource should not be deletable or erasable', () => {
+  it.skip('ThingPicture resource should not be deletable or erasable', () => {
     project0001Page.visitClass('ThingPicture');
     cy.get('[data-cy=resource-list-item] h3.res-class-value').contains(thingPictureData.label).click();
     cy.get('[data-cy=resource-toolbar-more-button]').should('not.exist');
@@ -101,7 +101,7 @@ describe('Check project admin existing resource functionality', () => {
     cy.get('[data-cy=property-value-comment]').contains(thingPictureData.titles[0].comment);
   });
 
-  it('ThingPicture resource should be editable', () => {
+  it.skip('ThingPicture resource should be editable', () => {
     project0001Page.visitClass('ThingPicture');
     cy.get('[data-cy=resource-list-item] h3.res-class-value').contains(thingPictureData.label).click();
 

diff --git a/apps/dsp-app/cypress/e2e/project-member/resource-project-admin.cy.ts b/apps/dsp-app/cypress/e2e/project-member/resource-project-admin.cy.ts
@@ -1,4 +1,4 @@
-import { UploadedFileResponse } from '@dasch-swiss/vre/shared/app-representations';
+import { UploadedFileResponse } from '@dasch-swiss/vre/resource-editor/representations';
 import { faker } from '@faker-js/faker';
 import { ThingPictureClass } from '../../models/existing-data-models';
 import { UserProfiles } from '../../models/user-profiles';

diff --git a/apps/dsp-app/src/app/app-routing.module.ts b/apps/dsp-app/src/app/app-routing.module.ts
@@ -1,10 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { ResourcePage2Component, ResourcePageComponent } from '@dasch-swiss/vre/resource-editor/resource-editor';
+import { CreateResourcePageComponent } from '@dasch-swiss/vre/resource-editor/resource-properties';
 import { StatusComponent } from '@dasch-swiss/vre/shared/app-common-to-move';
 import { RouteConstants } from '@dasch-swiss/vre/shared/app-config';
 import { HelpPageComponent } from '@dasch-swiss/vre/shared/app-help-page';
 import { CreateListInfoPageComponent, ListPageComponent } from '@dasch-swiss/vre/shared/app-list';
-import { DataModelsComponent, OntologyComponent, OntologyFormComponent } from '@dasch-swiss/vre/shared/app-ontology';
+import { DataModelsComponent, OntologyComponent } from '@dasch-swiss/vre/shared/app-ontology';
 import { OntologyClassInstanceComponent } from '@dasch-swiss/vre/shared/app-ontology-classes';
 import {
   CollaborationComponent,
@@ -13,8 +15,6 @@ import {
   EditProjectFormPageComponent,
   ProjectComponent,
 } from '@dasch-swiss/vre/shared/app-project';
-import { ResourcePage2Component, ResourcePageComponent } from '@dasch-swiss/vre/shared/app-resource-page';
-import { CreateResourcePageComponent } from '@dasch-swiss/vre/shared/app-resource-properties';
 import { AdvancedSearchContainerComponent, ResultsComponent } from '@dasch-swiss/vre/shared/app-search';
 import { ImageSettingsComponent, SettingsPageComponent } from '@dasch-swiss/vre/shared/app-settings-page';
 import {

diff --git a/apps/dsp-app/src/app/app.module.ts b/apps/dsp-app/src/app/app.module.ts
@@ -10,6 +10,11 @@ import { CKEditorModule } from '@ckeditor/ckeditor5-angular';
 import { MatJDNConvertibleCalendarDateAdapterModule } from '@dasch-swiss/jdnconvertiblecalendardateadapter';
 import { AdvancedSearchComponent } from '@dasch-swiss/vre/advanced-search';
 import { BASE_PATH } from '@dasch-swiss/vre/open-api';
+import { MathJaxComponents } from '@dasch-swiss/vre/resource-editor/mathjax';
+import { RepresentationsComponents } from '@dasch-swiss/vre/resource-editor/representations';
+import { ResourcePageComponents } from '@dasch-swiss/vre/resource-editor/resource-editor';
+import { ResourcePropertiesComponents } from '@dasch-swiss/vre/resource-editor/resource-properties';
+import { SegmentSupportComponents } from '@dasch-swiss/vre/resource-editor/segment-support';
 import { PendoAnalyticsService } from '@dasch-swiss/vre/shared/app-analytics';
 import { CommonToMoveComponents } from '@dasch-swiss/vre/shared/app-common-to-move';
 import {
@@ -25,7 +30,6 @@ import { AppErrorHandler } from '@dasch-swiss/vre/shared/app-error-handler';
 import { HelpPageComponents } from '@dasch-swiss/vre/shared/app-help-page';
 import { LocalizationService } from '@dasch-swiss/vre/shared/app-helper-services';
 import { ListComponents } from '@dasch-swiss/vre/shared/app-list';
-import { MathJaxComponents } from '@dasch-swiss/vre/shared/app-mathjax';
 import { NotificationService } from '@dasch-swiss/vre/shared/app-notification';
 import { OntologyComponents } from '@dasch-swiss/vre/shared/app-ontology';
 import { OntologyClassesComponents } from '@dasch-swiss/vre/shared/app-ontology-classes';
@@ -35,11 +39,7 @@ import {
 } from '@dasch-swiss/vre/shared/app-progress-indicator';
 import { ProjectComponents } from '@dasch-swiss/vre/shared/app-project';
 import { PropertyFormComponents } from '@dasch-swiss/vre/shared/app-property-form';
-import { RepresentationsComponents } from '@dasch-swiss/vre/shared/app-representations';
-import { ResourcePageComponents } from '@dasch-swiss/vre/shared/app-resource-page';
-import { ResourcePropertiesComponents } from '@dasch-swiss/vre/shared/app-resource-properties';
 import { SearchComponents } from '@dasch-swiss/vre/shared/app-search';
-import { SegmentSupportComponents } from '@dasch-swiss/vre/shared/app-segment-support';
 import { SettingsPageComponents } from '@dasch-swiss/vre/shared/app-settings-page';
 import { NgxsStoreModule } from '@dasch-swiss/vre/shared/app-state';
 import {

diff --git a/apps/dsp-app/src/assets/i18n/de.json b/apps/dsp-app/src/assets/i18n/de.json
@@ -180,7 +180,10 @@
   },
   "resource": {
     "properties": "Eigenschaften",
-    "comment": "Kommentar"
+    "comment": "Kommentar",
+    "propertyLabels": {
+      "linkedProperty": "Verlinkte Ressource"
+    }
   },
   "searchPanel": {
     "howToSearch": "Wie suchen?",
@@ -214,4 +217,4 @@
       "myAccount": "Mein Konto"
     }
   }
-}
+}
diff --git a/apps/dsp-app/src/assets/i18n/en.json b/apps/dsp-app/src/assets/i18n/en.json
@@ -207,7 +207,10 @@
   },
   "resource": {
     "properties": "Properties",
-    "comment": "Comment"
+    "comment": "Comment",
+    "propertyLabels": {
+      "linkedProperty": "Linked resource"
+    }
   },
   "searchPanel": {
     "howToSearch": "How to search",
@@ -241,4 +244,4 @@
       "myAccount": "My Account"
     }
   }
-}
+}
diff --git a/apps/dsp-app/src/assets/i18n/fr.json b/apps/dsp-app/src/assets/i18n/fr.json
@@ -207,7 +207,10 @@
   },
   "resource": {
     "properties": "Properties",
-    "comment": "Comment"
+    "comment": "Comment",
+    "propertyLabels": {
+      "linkedProperty": "Ressource liée"
+    }
   },
   "searchPanel": {
     "howToSearch": "How to search",
@@ -241,4 +244,4 @@
       "myAccount": "My Account"
     }
   }
-}
+}
diff --git a/apps/dsp-app/src/assets/i18n/it.json b/apps/dsp-app/src/assets/i18n/it.json
@@ -207,7 +207,10 @@
   },
   "resource": {
     "properties": "Properties",
-    "comment": "Comment"
+    "comment": "Comment",
+    "propertyLabels": {
+      "linkedProperty": "Risorse collegate"
+    }
   },
   "searchPanel": {
     "howToSearch": "How to search",
@@ -241,4 +244,4 @@
       "myAccount": "My Account"
     }
   }
-}
+}
diff --git a/apps/dsp-app/src/assets/i18n/rm.json b/apps/dsp-app/src/assets/i18n/rm.json
@@ -207,7 +207,10 @@
   },
   "resource": {
     "properties": "Properties",
-    "comment": "Comment"
+    "comment": "Comment",
+    "propertyLabels": {
+      "linkedProperty": "Linked resource"
+    }
   },
   "searchPanel": {
     "howToSearch": "How to search",
@@ -241,4 +244,4 @@
       "myAccount": "My Account"
     }
   }
-}
+}
diff --git a/apps/dsp-app/src/styles.scss b/apps/dsp-app/src/styles.scss
@@ -11,13 +11,9 @@
 @use "styles/viewer";
 @use "styles/ontology";
 
-/* TODO(mdc-migration): Remove legacy-core once all legacy components are migrated*/
-@include mat.legacy-core();
 @include mat.core();
 
 // Include all typography configurations for the components (now separate from mat.core())
-/* TODO(mdc-migration): Remove all-legacy-component-typographies once all legacy components are migrated*/
-@include mat.all-legacy-component-typographies();
 @include mat.all-component-typographies(t.$dsp-typography-config);
 
 // Define the color palettes for the theme.
@@ -34,8 +30,6 @@ $theme: mat.define-light-theme((
 ));
 
 // Include all theme styles for the components.
-/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
-@include mat.all-legacy-component-themes($theme);
 @include mat.all-component-themes($theme);
 
 
@@ -210,4 +204,4 @@ button.space-reducer {
 
 .mat-mdc-dialog-content { //prevent horizontal scrollbar in dialog
   overflow-x: hidden !important;
-}
+}
diff --git a/apps/dsp-app/src/styles/_elements.scss b/apps/dsp-app/src/styles/_elements.scss
@@ -749,12 +749,50 @@ nav.mat-mdc-tab-nav-bar,
 }
 
 .annotation-tooltip {
+  display: none;
+  position: fixed;
+  background-color: $black-60-opacity;
+  color: $bright;
+  padding: 8px;
+  border-radius: $border-radius;
+  min-height: 24px;
+  max-height: 258px;
+  max-width: 256px;
+  box-sizing: border-box;
+  transition: 0.1s;
+  transform: translate(16px, 16px);
+  font-size: small;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  z-index: 1000;
+
   p {
     white-space: normal;
     text-overflow: ellipsis;
   }
 }
 
+.region {
+  filter: alpha(opacity=40);
+  opacity: 0.4;
+  fill: transparent;
+  stroke: #00695c;
+  stroke-width: 2px;
+}
+
+.region:hover,
+.region:focus {
+  filter: alpha(opacity=100);
+  opacity: 1;
+  cursor: pointer;
+}
+
+.region.active {
+  filter: alpha(opacity=100);
+  opacity: 1;
+}
+
 // --------------------------------------
 
 //

diff --git a/apps/dsp-app/src/styles/_layout.scss b/apps/dsp-app/src/styles/_layout.scss
@@ -250,40 +250,3 @@
 .inline {
   display: inline-flex;
 }
-
-// --------------------------------------
-
-// ?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-
-// TODO: clean up the following classes
-// ?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-?-
-
-.flex-panel {
-  display: flex !important;
-}
-
-// font sizes
-
-.smaller {
-  font-size: small;
-}
-
-//
-// dialog: not the one from material, it's a fullframe dialog box
-.window.fullframe {
-  position: absolute;
-  z-index: 100;
-  top: 0;
-  width: 100vw;
-  height: 100vh;
-  background: white;
-}
-
-// --------------------------------------
-
-//
-// color
-.transparent {
-  background: none;
-}
-
-// --------------------------------------