diff --git a/.github/workflows/publish-api-docs.yml b/.github/workflows/publish-api-docs.yml index 76925bf3ac..496d1e5952 100644 --- a/.github/workflows/publish-api-docs.yml +++ b/.github/workflows/publish-api-docs.yml @@ -18,26 +18,38 @@ jobs: with: fetch-depth: 0 - - name: Pushes swagger file to src + - name: Pushes swagger file to data-apis-v1 uses: dmnemec/copy_file_to_another_repo_action@1b29cbd9a323185f20b175dc6d5f8f31be5c0658 env: API_TOKEN_GITHUB: ${{ secrets.GH_TOKEN }} with: source_file: 'packages/nocodb/src/schema/swagger.json' destination_repo: 'nocodb/noco-apis-doc' - destination_folder: 'src' + destination_folder: 'data-apis-v1' user_email: 'oof1lab@gmail.com' user_name: 'o1lab' commit_message: 'Autorelease from github.com/nocodb/nocodb' - - name: Pushes swagger file to meta-src + - name: Pushes swagger file to data-apis-v2 uses: dmnemec/copy_file_to_another_repo_action@1b29cbd9a323185f20b175dc6d5f8f31be5c0658 env: API_TOKEN_GITHUB: ${{ secrets.GH_TOKEN }} with: source_file: 'packages/nocodb/src/schema/swagger.json' destination_repo: 'nocodb/noco-apis-doc' - destination_folder: 'meta-src' + destination_folder: 'data-apis-v2' + user_email: 'oof1lab@gmail.com' + user_name: 'o1lab' + commit_message: 'Autorelease from github.com/nocodb/nocodb' + + - name: Pushes swagger file to meta-apis-v1 + uses: dmnemec/copy_file_to_another_repo_action@1b29cbd9a323185f20b175dc6d5f8f31be5c0658 + env: + API_TOKEN_GITHUB: ${{ secrets.GH_TOKEN }} + with: + source_file: 'packages/nocodb/src/schema/swagger.json' + destination_repo: 'nocodb/noco-apis-doc' + destination_folder: 'meta-apis-v1' user_email: 'oof1lab@gmail.com' user_name: 'o1lab' commit_message: 'Autorelease from github.com/nocodb/nocodb' diff --git a/SECURITY.md b/SECURITY.md index db8953bed0..2fd791a798 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,5 +3,5 @@ ### Reporting a Vulnerability Please report (suspected) security vulnerabilities to security@nocodb.com -- You will receive a response from us within 3 working days. -- If the issue is confirmed, we will release a patch as soon as possible depending on complexity but historically within a few days. \ No newline at end of file +- You will receive a response from us within 7 working days. +- If the issue is confirmed, we will release a patch as soon as possible depending on complexity but historically within a few days. diff --git a/charts/nocodb/templates/deployment.yaml b/charts/nocodb/templates/deployment.yaml index 582d365df8..785b0adf0f 100644 --- a/charts/nocodb/templates/deployment.yaml +++ b/charts/nocodb/templates/deployment.yaml @@ -33,9 +33,11 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.storage.enabled }} volumeMounts: - name: {{ include "nocodb.fullname" . }} mountPath: /usr/app/data + {{- end }} envFrom: - configMapRef: name: {{ include "nocodb.fullname" . }} @@ -67,7 +69,9 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- if .Values.storage.enabled }} volumes: - name: {{ include "nocodb.fullname" . }} persistentVolumeClaim: claimName: {{ include "nocodb.fullname" . }} + {{- end }} diff --git a/charts/nocodb/templates/pvc.yaml b/charts/nocodb/templates/pvc.yaml index 092a1b0439..369480f057 100644 --- a/charts/nocodb/templates/pvc.yaml +++ b/charts/nocodb/templates/pvc.yaml @@ -1,3 +1,4 @@ +{{ if .Values.storage.enabled }} apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -12,3 +13,4 @@ spec: accessModes: {{- default (toYaml .Values.storage.accessModes) "- ReadWriteMany" | nindent 4 }} volumeMode: Filesystem +{{ end }} diff --git a/charts/nocodb/values.yaml b/charts/nocodb/values.yaml index 881e31cdbb..ad84527338 100644 --- a/charts/nocodb/values.yaml +++ b/charts/nocodb/values.yaml @@ -86,6 +86,10 @@ extraSecretEnvs: NC_DB: "mysql2://mysql:3306?u=nocodb&p=secretPass&d=nocodb" storage: + # If disabled, another persistent storage should be configured for attachments to work. + # We recommend setting NC_S3_BUCKET_NAME and other NC_S3* environment variables. + # Refer documentation for more details. + enabled: true size: 3Gi storageClassName: "" diff --git a/packages/nc-gui/assets/nc-icons/owner.svg b/packages/nc-gui/assets/nc-icons/owner.svg index c2ad9a442f..effffd02de 100644 --- a/packages/nc-gui/assets/nc-icons/owner.svg +++ b/packages/nc-gui/assets/nc-icons/owner.svg @@ -1,9 +1,8 @@ - - + + - - - + + \ No newline at end of file diff --git a/packages/nc-gui/components/account/Profile.vue b/packages/nc-gui/components/account/Profile.vue index ab5406de74..c695c6813e 100644 --- a/packages/nc-gui/components/account/Profile.vue +++ b/packages/nc-gui/components/account/Profile.vue @@ -63,10 +63,10 @@ const onValidate = async (_: any, valid: boolean) => { diff --git a/packages/nc-gui/components/account/Token.vue b/packages/nc-gui/components/account/Token.vue index 8b0b84c1fd..4e665c30ab 100644 --- a/packages/nc-gui/components/account/Token.vue +++ b/packages/nc-gui/components/account/Token.vue @@ -160,10 +160,10 @@ const handleCancel = () => { + + diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue index cbffbbdfc8..4d29a0ed5e 100644 --- a/packages/nc-gui/components/account/UserList.vue +++ b/packages/nc-gui/components/account/UserList.vue @@ -153,9 +153,9 @@ const openDeleteModal = (user: UserType) => { @@ -130,7 +140,7 @@ watch( 'bg-gray-50': projectPageTab !== 'data-source', }" > - {{ base.sources.length - 1 }} + {{ base.sources.length }} diff --git a/packages/nc-gui/components/smartsheet/Details.vue b/packages/nc-gui/components/smartsheet/Details.vue index 5c5915a452..32484a243f 100644 --- a/packages/nc-gui/components/smartsheet/Details.vue +++ b/packages/nc-gui/components/smartsheet/Details.vue @@ -33,7 +33,7 @@ const openedSubTab = computed({ watch(openedSubTab, () => { // TODO: Find a good way to know when the roles are populated and check // Re-enable this check for first render - if (openedSubTab.value === 'field' && !isUIAllowed('hookList')) { + if (openedSubTab.value === 'field' && !isUIAllowed('fieldAdd')) { onViewsTabChange('relation') } if (openedSubTab.value === 'webhook' && !isUIAllowed('hookList')) { diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue index b9fd4b1e62..a0ce7c4859 100644 --- a/packages/nc-gui/components/smartsheet/Kanban.vue +++ b/packages/nc-gui/components/smartsheet/Kanban.vue @@ -1,6 +1,6 @@