adjust frontend to changes in the backed (removal of google data)

1208ca53 · Piotr Gawron · 1d552081 · 1208ca53 · 1208ca53 · 1208ca53
Commit 1208ca53 authored 6 months ago by Piotr Gawron
--- a/docs/plugins/events.md
+++ b/docs/plugins/events.md
@@ -9,18 +9,17 @@ To listen for specific events, plugins can use the `addListener` method in `even

 - onAddDataOverlay - triggered after successfully adding an overlay; the created overlay is passed as an argument. Example argument:

-```javascript
+```json
 {
-   "name": "Example Overlay",
-   "googleLicenseConsent": false,
-   "creator": "appu-admin",
-   "description": "Different",
-   "genomeType": null,
-   "genomeVersion": null,
-   "idObject": 149,
-   "publicOverlay": false,
-   "type": "GENERIC",
-   "order": 9
+  "name": "Example Overlay",
+  "creator": "appu-admin",
+  "description": "Different",
+  "genomeType": null,
+  "genomeVersion": null,
+  "idObject": 149,
+  "publicOverlay": false,
+  "type": "GENERIC",
+  "order": 9
 }
 ```

@@ -32,10 +31,9 @@ To listen for specific events, plugins can use the `addListener` method in `even

 - onShowOverlay - triggered after displaying an overlay on the map; the displayed overlay is passed as an argument. Example argument:

-```javascript
+```json
 {
  "name": "Generic advanced format overlay",
-  "googleLicenseConsent": false,
  "creator": "appu-admin",
  "description": "Data set provided by a user",
  "genomeType": null,
@@ -49,10 +47,9 @@ To listen for specific events, plugins can use the `addListener` method in `even

 - onHideOverlay - triggered after disabling an overlay on the map; the disabled overlay is passed as an argument. Example argument:

-```javascript
+```json
 {
  "name": "colored overlay",
-  "googleLicenseConsent": false,
  "creator": "appu-admin",
  "description": "",
  "genomeType": null,

--- a/src/components/FunctionalArea/Modal/LoginModal/LoginModal.component.test.tsx
+++ b/src/components/FunctionalArea/Modal/LoginModal/LoginModal.component.test.tsx
@@ -97,6 +97,10 @@ describe('LoginModal - component', () => {
    });

    expect(store.getState().overlays.userOverlays.loading).toBe('succeeded');
+    // eslint-disable-next-line no-console
+    console.log(overlaysFixture);
+    // eslint-disable-next-line no-console
+    console.log(store.getState().overlays.userOverlays.data);
    expect(store.getState().overlays.userOverlays.data).toEqual(overlaysFixture);
  });
  it('should display loggedInMenuModal after successful login as admin', async () => {

--- a/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/UserOverlaysWithoutGroup.utils.test.ts
+++ b/src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysWithoutGroup/UserOverlaysWithoutGroup.utils.test.ts
@@ -7,7 +7,6 @@ const INPUT_ARRAY: MapOverlay[] = [
    name: 'Overlay1',
    description: 'Description1',
    type: 'Type1',
-    googleLicenseConsent: true,
    creator: 'Creator1',
    genomeType: 'GenomeType1',
    genomeVersion: 'GenomeVersion1',
@@ -19,7 +18,6 @@ const INPUT_ARRAY: MapOverlay[] = [
    name: 'Overlay2',
    description: 'Description2',
    type: 'Type2',
-    googleLicenseConsent: false,
    creator: 'Creator2',
    genomeType: 'GenomeType2',
    genomeVersion: 'GenomeVersion2',
@@ -31,7 +29,6 @@ const INPUT_ARRAY: MapOverlay[] = [
    name: 'Overlay3',
    description: 'Description3',
    type: 'Type3',
-    googleLicenseConsent: true,
    creator: 'Creator3',
    genomeType: 'GenomeType3',
    genomeVersion: 'GenomeVersion3',
@@ -48,7 +45,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay1',
        description: 'Description1',
        type: 'Type1',
-        googleLicenseConsent: true,
        creator: 'Creator1',
        genomeType: 'GenomeType1',
        genomeVersion: 'GenomeVersion1',
@@ -60,7 +56,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay3',
        description: 'Description3',
        type: 'Type3',
-        googleLicenseConsent: true,
        creator: 'Creator3',
        genomeType: 'GenomeType3',
        genomeVersion: 'GenomeVersion3',
@@ -72,7 +67,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay2',
        description: 'Description2',
        type: 'Type2',
-        googleLicenseConsent: false,
        creator: 'Creator2',
        genomeType: 'GenomeType2',
        genomeVersion: 'GenomeVersion2',
@@ -93,7 +87,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay1',
        description: 'Description1',
        type: 'Type1',
-        googleLicenseConsent: true,
        creator: 'Creator1',
        genomeType: 'GenomeType1',
        genomeVersion: 'GenomeVersion1',
@@ -105,7 +98,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay3',
        description: 'Description3',
        type: 'Type3',
-        googleLicenseConsent: true,
        creator: 'Creator3',
        genomeType: 'GenomeType3',
        genomeVersion: 'GenomeVersion3',
@@ -117,7 +109,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay2',
        description: 'Description2',
        type: 'Type2',
-        googleLicenseConsent: false,
        creator: 'Creator2',
        genomeType: 'GenomeType2',
        genomeVersion: 'GenomeVersion2',
@@ -138,7 +129,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay3',
        description: 'Description3',
        type: 'Type3',
-        googleLicenseConsent: true,
        creator: 'Creator3',
        genomeType: 'GenomeType3',
        genomeVersion: 'GenomeVersion3',
@@ -150,7 +140,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay1',
        description: 'Description1',
        type: 'Type1',
-        googleLicenseConsent: true,
        creator: 'Creator1',
        genomeType: 'GenomeType1',
        genomeVersion: 'GenomeVersion1',
@@ -162,7 +151,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay2',
        description: 'Description2',
        type: 'Type2',
-        googleLicenseConsent: false,
        creator: 'Creator2',
        genomeType: 'GenomeType2',
        genomeVersion: 'GenomeVersion2',
@@ -183,7 +171,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay2',
        description: 'Description2',
        type: 'Type2',
-        googleLicenseConsent: false,
        creator: 'Creator2',
        genomeType: 'GenomeType2',
        genomeVersion: 'GenomeVersion2',
@@ -195,7 +182,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay3',
        description: 'Description3',
        type: 'Type3',
-        googleLicenseConsent: true,
        creator: 'Creator3',
        genomeType: 'GenomeType3',
        genomeVersion: 'GenomeVersion3',
@@ -207,7 +193,6 @@ describe('moveArrayElement', () => {
        name: 'Overlay1',
        description: 'Description1',
        type: 'Type1',
-        googleLicenseConsent: true,
        creator: 'Creator1',
        genomeType: 'GenomeType1',
        genomeVersion: 'GenomeVersion1',

--- a/src/models/configurationSchema.ts
+++ b/src/models/configurationSchema.ts
@@ -69,8 +69,6 @@ export const privilegeTypeSchema = z.record(

 export const mapTypeSchema = z.object({ name: z.string(), id: z.string() });

-export const mapCanvasTypeSchema = z.object({ name: z.string(), id: z.string() });
-
 export const unitTypeSchema = z.object({ name: z.string(), id: z.string() });

 export const modificationStateTypeSchema = z.record(
@@ -93,7 +91,6 @@ export const configurationSchema = z.object({
  annotators: z.array(annotatorSchema),
  privilegeTypes: privilegeTypeSchema,
  mapTypes: z.array(mapTypeSchema),
-  mapCanvasTypes: z.array(mapCanvasTypeSchema),
  unitTypes: z.array(unitTypeSchema),
  modificationStateTypes: modificationStateTypeSchema,
 });
--- a/src/models/mapOverlay.ts
+++ b/src/models/mapOverlay.ts
 import { z } from 'zod';
+import { ZERO } from '@/constants/common';

 export const mapOverlay = z.object({
+  idObject: z.number(),
  name: z.string(),
-  googleLicenseConsent: z.boolean(),
+  order: z.number().int().gte(ZERO),
  creator: z.string(),
  description: z.string(),
  genomeType: z.string().nullable(),
  genomeVersion: z.string().nullable(),
-  idObject: z.number(),
  publicOverlay: z.boolean(),
  type: z.string(),
-  order: z.number(),
 });

 export const createdOverlayFileSchema = z.object({
@@ -25,7 +25,6 @@ export const uploadedOverlayFileContentSchema = createdOverlayFileSchema.extend(

 export const createdOverlaySchema = z.object({
  name: z.string(),
-  googleLicenseConsent: z.boolean(),
  creator: z.string(),
  description: z.string(),
  genomeType: z.string().nullable(),

--- a/src/models/projectSchema.ts
+++ b/src/models/projectSchema.ts
@@ -21,7 +21,6 @@ export const projectSchema = z.object({
  }),
  projectId: z.string(),
  creationDate: z.string(),
-  mapCanvasType: z.string(),
  overviewImageViews: z.array(overviewImageView),
  topOverviewImage: overviewImageView.nullable(),
 });
--- a/src/redux/overlays/overlays.mock.ts
+++ b/src/redux/overlays/overlays.mock.ts
@@ -28,7 +28,6 @@ export const OVERLAYS_INITIAL_STATE_MOCK: OverlaysState = {
 export const PUBLIC_OVERLAYS_MOCK: MapOverlay[] = [
  {
    name: 'PD substantia nigra',
-    googleLicenseConsent: false,
    creator: 'appu-admin',
    description:
      'Differential transcriptome expression from post mortem tissue. Meta-analysis from 8 published datasets, FDR = 0.05, see PMIDs 23832570 and 25447234.',
@@ -41,7 +40,6 @@ export const PUBLIC_OVERLAYS_MOCK: MapOverlay[] = [
  },
  {
    name: 'Ageing brain',
-    googleLicenseConsent: false,
    creator: 'appu-admin',
    description:
      'Differential transcriptome expression from post mortem tissue. Source: Allen Brain Atlas datasets, see PMID 25447234.',
@@ -54,7 +52,6 @@ export const PUBLIC_OVERLAYS_MOCK: MapOverlay[] = [
  },
  {
    name: 'PRKN variants example',
-    googleLicenseConsent: false,
    creator: 'appu-admin',
    description: 'PRKN variants',
    genomeType: 'UCSC',
@@ -66,7 +63,6 @@ export const PUBLIC_OVERLAYS_MOCK: MapOverlay[] = [
  },
  {
    name: 'PRKN variants doubled',
-    googleLicenseConsent: false,
    creator: 'appu-admin',
    description: 'PRKN variants',
    genomeType: 'UCSC',
@@ -78,7 +74,6 @@ export const PUBLIC_OVERLAYS_MOCK: MapOverlay[] = [
  },
  {
    name: 'Generic advanced format overlay',
-    googleLicenseConsent: false,
    creator: 'appu-admin',
    description: 'Data set provided by a user',
    genomeType: null,
@@ -125,7 +120,6 @@ export const ADD_OVERLAY_MOCK = {
 export const USER_OVERLAYS_MOCK: MapOverlay[] = [
  {
    name: 'PD substantia nigra',
-    googleLicenseConsent: false,
    creator: 'appu-admin',
    description:
      'Differential transcriptome expression from post mortem tissue. Meta-analysis from 8 published datasets, FDR = 0.05, see PMIDs 23832570 and 25447234.',
@@ -138,7 +132,6 @@ export const USER_OVERLAYS_MOCK: MapOverlay[] = [
  },
  {
    name: 'Ageing brain',
-    googleLicenseConsent: false,
    creator: 'appu-admin',
    description:
      'Differential transcriptome expression from post mortem tissue. Source: Allen Brain Atlas datasets, see PMID 25447234.',

--- a/src/redux/overlays/overlays.thunks.ts
+++ b/src/redux/overlays/overlays.thunks.ts
@@ -159,7 +159,6 @@ const creteOverlay = async ({
    name,
    description,
    filename: createdFile.filename,
-    googleLicenseConsent: false.toString(),
    type,
    fileId: createdFile.id.toString(),
  };