fix: issues and update apps-query-client dep (#190)

* fix: update dep and fix issues

* fix: invert function of verbose messages (#189)

* fix: allow to send comments to everyone

* fix: preset view

* fix: sonar issues

* fix: remove test looking for preset view

* fix: tests

Author: spaenleh

.github/workflows/cypress.yml

@@ -32,7 +32,6 @@ jobs:
           VITE_GRAASP_APP_KEY: id-1234567890
           VITE_MOCK_API: true
           VITE_VERSION: cypress-tests
-          VITE_DEBUG: false
         with:
           install: false
           build: yarn build:test

.github/workflows/deploy-dev.yml

@@ -30,7 +30,6 @@ jobs:
           VITE_SENTRY_ENV: development
           VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           VITE_VERSION: ${{ github.sha }}
-          VITE_DEBUG: false
         run: yarn build
         shell: bash
 

.github/workflows/deploy-prod.yml

@@ -29,7 +29,6 @@ jobs:
           VITE_SENTRY_ENV: production
           VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           VITE_VERSION: ${{ github.event.client_payload.tag }}
-          VITE_DEBUG: false
         run: yarn build
         shell: bash
 

.github/workflows/deploy-stage.yml

@@ -29,7 +29,6 @@ jobs:
           VITE_SENTRY_ENV: staging
           VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           VITE_VERSION: ${{ github.event.client_payload.tag }}
-          VITE_DEBUG: false
         run: yarn build
         shell: bash
 

README.md

@@ -20,7 +20,7 @@ VITE_API_HOST=http://localhost:3000
 VITE_MOCK_API=true
 VITE_GRAASP_APP_KEY=45678-677889
 VITE_VERSION=latest
-VITE_DEBUG=false # disable success toast message
+# VITE_ENABLE_VERBOSE_MESSAGES=true # comment this out if you want to enable verbose messages
 ```
 
 Launch the app with `yarn dev`.
@@ -35,7 +35,7 @@ VITE_API_HOST=http://localhost:3000
 VITE_MOCK_API=true
 VITE_GRAASP_APP_KEY=45678-677889
 VITE_VERSION=latest
-VITE_DEBUG=false # disable success toast message
+# VITE_ENABLE_VERBOSE_MESSAGES=true # verbose messages will be shown when this is set
 
 # dont open browser
 BROWSER=none

cypress/e2e/builder/manageAppResources.cy.ts

@@ -101,14 +101,15 @@ describe('Builder as Admin', () => {
       cy.get(buildDataCy(TAB_TABLE_VIEW_CYPRESS)).should('be.visible').click();
     });
 
-    it('Orphan comments', () => {
+    it.only('Orphan comments', () => {
       // table view pane should be displayed
       cy.get(buildDataCy(TABLE_VIEW_PANE_CYPRESS)).should('be.visible');
 
       // check that all users are displayed
       const comments = [
         ...SINGLE_LINE_MOCK_COMMENTS,
         ...MULTILINE_MOCK_COMMENTS,
+        MOCK_ORPHAN_COMMENT,
       ].filter((r) => r.type === APP_DATA_TYPES.COMMENT) as CommentType[];
       const orphansId = getOrphans(comments).map((c) => c.id);
       const nonOrphanComments = comments?.filter(

cypress/e2e/codeReview/codeReview.cy.ts

@@ -18,13 +18,7 @@ import {
   COMMENT_THREAD_CONTAINER_CYPRESS,
   COMMIT_INFO_DIALOG_CYPRESS,
   CUSTOM_DIALOG_TITLE_CYPRESS,
-  DISPLAY_SETTINGS_FAB_CYPRESS,
   PLAYER_VIEW_CYPRESS,
-  REPL_EDITOR_ID_CY,
-  SETTINGS_DIALOG_CANCEL_BUTTON_CYPRESS,
-  SETTINGS_DIALOG_SAVE_BUTTON_CYPRESS,
-  SHOW_LINE_NUMBERS_SWITCH_CYPRESS,
-  TAB_PRESET_VIEW_CYPRESS,
   TOOLBAR_COMMIT_INFO_BUTTON_CYPRESS,
   TOOLBAR_EDIT_CODE_BUTTON_CYPRESS,
   TOOLBAR_RUN_CODE_BUTTON_CYPRESS,
@@ -327,77 +321,3 @@ describe('Comment settings', () => {
     );
   });
 });
-
-describe('Show Line Numbers Setting Builder View', () => {
-  beforeEach(() => {
-    cy.setUpApi({
-      database: {
-        appSettings: [
-          MOCK_GENERAL_SETTINGS,
-          {
-            ...MOCK_GENERAL_SETTINGS,
-            data: {
-              ...DEFAULT_GENERAL_SETTINGS,
-              [GeneralSettingsKeys.ShowLineNumbers]: true,
-            },
-          },
-          MOCK_CODE_SETTINGS,
-        ],
-      },
-      appContext: {
-        context: Context.Builder,
-        permission: PermissionLevel.Admin,
-      },
-    });
-    cy.visit('/');
-  });
-
-  it('Toggling Line Numbers Switch from Display Settings', () => {
-    // Check For Line Numbers Are Shown.
-    // Open Preset View.
-    cy.get(buildDataCy(TAB_PRESET_VIEW_CYPRESS))
-      .should('be.visible')
-      .as('presetViewTab')
-      .click();
-    // Open Display Settings.
-    cy.get(buildDataCy(DISPLAY_SETTINGS_FAB_CYPRESS))
-      .should('be.visible')
-      .as('displaySettingsFab')
-      .click();
-    // Check that Line Numbers Switch is checked.
-    cy.get(
-      `${buildDataCy(SHOW_LINE_NUMBERS_SWITCH_CYPRESS)} input[type="checkbox"]`,
-    ).should('be.checked');
-    // Click on Cancel button from the display settings window.
-    cy.get(buildDataCy(SETTINGS_DIALOG_CANCEL_BUTTON_CYPRESS))
-      .as('cancelButton')
-      .should('be.visible')
-      .click();
-    // Check that line numbers are shown.
-    cy.get(`#${REPL_EDITOR_ID_CY} .cm-lineNumbers`).should('be.visible');
-    // Check For Line Numbers Are Not Shown.
-    // Open Display Settings.
-    cy.get(buildDataCy(DISPLAY_SETTINGS_FAB_CYPRESS))
-      .should('be.visible')
-      .as('displaySettingsFab')
-      .click();
-    cy.wait(waitingDelay);
-    // Click on switch to toggle setting, check that the switch shouldn't be checked.
-    cy.get(
-      `${buildDataCy(SHOW_LINE_NUMBERS_SWITCH_CYPRESS)} input[type="checkbox"]`,
-    ).click();
-    cy.get(
-      `${buildDataCy(SHOW_LINE_NUMBERS_SWITCH_CYPRESS)} input[type="checkbox"]`,
-    ).should('not.to.be.checked');
-    // Click on Save button from the display settings window.
-    cy.get(buildDataCy(SETTINGS_DIALOG_SAVE_BUTTON_CYPRESS))
-      .as('saveButton')
-      .should('not.be.disabled');
-    cy.get(buildDataCy(SETTINGS_DIALOG_SAVE_BUTTON_CYPRESS)).click({
-      // this seems necessary even if the behavior is correct when doing it at human speeds
-      force: true,
-    });
-    // Check that line numbers are not shown.
-    cy.get(`#${REPL_EDITOR_ID_CY} .cm-lineNumbers`).should('not.exist');
-  });
-});

cypress/fixtures/appData.ts

@@ -105,40 +105,6 @@ export const MULTILINE_MOCK_COMMENTS: AppData[] = [
     type: APP_DATA_TYPES.COMMENT,
     visibility: AppDataVisibility.Member,
   },
-  {
-    id: uuid(),
-    data: { text: 'some text' },
-    member: MEMBERS.BOB,
-    creator: MEMBERS.BOB,
-    item: MOCK_SERVER_ITEM,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    type: APP_DATA_TYPES.COMMENT,
-    visibility: AppDataVisibility.Member,
-  },
-  {
-    id: uuid(),
-    data: { text: 'some text' },
-    member: CURRENT_MEMBER,
-    creator: CURRENT_MEMBER,
-    item: MOCK_SERVER_ITEM,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    type: APP_DATA_TYPES.COMMENT,
-    visibility: AppDataVisibility.Member,
-  },
-  // teacher comments
-  {
-    id: uuid(),
-    data: { text: 'some text' },
-    member: CURRENT_MEMBER,
-    creator: CURRENT_MEMBER,
-    item: MOCK_SERVER_ITEM,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    type: APP_DATA_TYPES.TEACHER_COMMENT,
-    visibility: AppDataVisibility.Member,
-  },
 ];
 
 export const generateSingleLineThread = (

cypress/fixtures/members.ts

@@ -4,7 +4,7 @@ export const MEMBERS: { [key: string]: CompleteMember } = {
   ANNA: {
     id: '0f0a2774-a965-4b97-afb4-bccc3796e060',
     name: 'anna',
-    email: 'bob@gmail.com',
+    email: 'anna@gmail.com',
     extra: {},
     type: MemberType.Individual,
     createdAt: new Date().toISOString(),

package.json

@@ -23,7 +23,7 @@
     "@fortawesome/free-regular-svg-icons": "6.5.1",
     "@fortawesome/free-solid-svg-icons": "6.5.1",
     "@fortawesome/react-fontawesome": "0.2.0",
-    "@graasp/apps-query-client": "3.4.0",
+    "@graasp/apps-query-client": "github:graasp/graasp-apps-query-client#hotfix-app-data-key",
     "@graasp/pyodide": "github:graasp/graasp-pyodide",
     "@graasp/sdk": "3.3.0",
     "@graasp/ui": "4.1.1",
@@ -86,7 +86,7 @@
     "hooks:install": "husky install",
     "hooks:uninstall": "husky uninstall",
     "pre-commit": "yarn prettier:check && yarn lint",
-    "cypress:open": "env-cmd -f ./.env.development cypress open",
+    "cypress:open": "env-cmd -f ./.env.test cypress open",
     "test": "yarn build:test && concurrently -k -s first \"yarn preview:test\" \"yarn test:ci\"",
     "test:ci": "env-cmd -f ./.env.test cypress run && nyc report --reporter=text --reporter=text-summary",
     "cov:report": "open ./coverage/lcov-report/index.html"
@@ -129,11 +129,7 @@
     "vite-plugin-istanbul": "5.0.0"
   },
   "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
+    "production": [">0.2%", "not dead", "not op_mini all"],
     "development": [
       "last 1 chrome version",
       "last 1 firefox version",
@@ -142,13 +138,8 @@
   },
   "nyc": {
     "all": true,
-    "include": [
-      "src/**/*.{js,ts,jsx,tsx}"
-    ],
-    "exclude": [
-      "src/setupTests.ts",
-      "src/**/*.d.ts"
-    ]
+    "include": ["src/**/*.{js,ts,jsx,tsx}"],
+    "exclude": ["src/setupTests.ts", "src/**/*.d.ts"]
   },
   "resolutions": {
     "@codemirror/state": "6.3.3"