From bbc34aed63340a08885e9c7ab6ab06ffd484dc0a Mon Sep 17 00:00:00 2001 From: RuriRyan <2413490+RuriRyan@users.noreply.github.com> Date: Fri, 23 Dec 2022 10:09:27 +0100 Subject: [PATCH 01/47] Adds helm chart Initial work was done by https://github.com/one-acre-fund/oaf-public-charts/tree/main/charts/nocodb The changes include mostly fixes and the addition of missing features. --- charts/nocodb/.gitignore | 2 + charts/nocodb/.helmignore | 23 +++++ charts/nocodb/Chart.yaml | 12 +++ charts/nocodb/templates/NOTES.txt | 22 +++++ charts/nocodb/templates/_helpers.tpl | 82 ++++++++++++++++ charts/nocodb/templates/configmap.yaml | 13 +++ charts/nocodb/templates/deployment.yaml | 73 ++++++++++++++ charts/nocodb/templates/hpa.yaml | 28 ++++++ charts/nocodb/templates/ingress.yaml | 61 ++++++++++++ charts/nocodb/templates/pvc.yaml | 14 +++ charts/nocodb/templates/secret.yaml | 13 +++ charts/nocodb/templates/service.yaml | 15 +++ charts/nocodb/templates/serviceaccount.yaml | 12 +++ .../templates/tests/test-connection.yaml | 15 +++ charts/nocodb/values.yaml | 98 +++++++++++++++++++ 15 files changed, 483 insertions(+) create mode 100644 charts/nocodb/.gitignore create mode 100644 charts/nocodb/.helmignore create mode 100644 charts/nocodb/Chart.yaml create mode 100644 charts/nocodb/templates/NOTES.txt create mode 100644 charts/nocodb/templates/_helpers.tpl create mode 100644 charts/nocodb/templates/configmap.yaml create mode 100644 charts/nocodb/templates/deployment.yaml create mode 100644 charts/nocodb/templates/hpa.yaml create mode 100644 charts/nocodb/templates/ingress.yaml create mode 100644 charts/nocodb/templates/pvc.yaml create mode 100644 charts/nocodb/templates/secret.yaml create mode 100644 charts/nocodb/templates/service.yaml create mode 100644 charts/nocodb/templates/serviceaccount.yaml create mode 100644 charts/nocodb/templates/tests/test-connection.yaml create mode 100644 charts/nocodb/values.yaml diff --git a/charts/nocodb/.gitignore b/charts/nocodb/.gitignore new file mode 100644 index 0000000000..f791801bca --- /dev/null +++ b/charts/nocodb/.gitignore @@ -0,0 +1,2 @@ +charts/ +Chart.lock diff --git a/charts/nocodb/.helmignore b/charts/nocodb/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/charts/nocodb/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/nocodb/Chart.yaml b/charts/nocodb/Chart.yaml new file mode 100644 index 0000000000..db58bf049b --- /dev/null +++ b/charts/nocodb/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v2 +appVersion: 0.100.2 +dependencies: +- condition: postgresql.enabled + name: postgresql + repository: https://charts.bitnami.com/bitnami + version: ~11.6.6 +description: A Helm chart for Kubernetes +maintainers: [] +name: nocodb +type: application +version: 0.3.0 diff --git a/charts/nocodb/templates/NOTES.txt b/charts/nocodb/templates/NOTES.txt new file mode 100644 index 0000000000..0594ffd042 --- /dev/null +++ b/charts/nocodb/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "nocodb.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "nocodb.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "nocodb.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "nocodb.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/nocodb/templates/_helpers.tpl b/charts/nocodb/templates/_helpers.tpl new file mode 100644 index 0000000000..6a5723a0df --- /dev/null +++ b/charts/nocodb/templates/_helpers.tpl @@ -0,0 +1,82 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "nocodb.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "nocodb.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "nocodb.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "nocodb.labels" -}} +helm.sh/chart: {{ include "nocodb.chart" . }} +{{ include "nocodb.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "nocodb.selectorLabels" -}} +app.kubernetes.io/name: {{ include "nocodb.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "nocodb.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "nocodb.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} + +{{- define "postgresHost" -}} +{{- printf "%s-postgresql" .Release.Name }} +{{- end }} + +{{- define "postgresDatabase" -}} +{{- .Values.postgresql.auth.database }} +{{- end }} + +{{- define "postgresUsername" -}} +{{- .Values.postgresql.auth.username }} +{{- end }} + +{{- define "postgresPassword" -}} +{{- .Values.postgresql.auth.password }} +{{- end }} + +{{- define "databaseUri" -}} +{{- printf "pg://%s:5432?u=%s&p=%s&d=%s" (include "postgresHost" .) (include "postgresUsername" .) (include "postgresPassword" .) (include "postgresDatabase" .) }} +{{- end }} diff --git a/charts/nocodb/templates/configmap.yaml b/charts/nocodb/templates/configmap.yaml new file mode 100644 index 0000000000..ef83a94612 --- /dev/null +++ b/charts/nocodb/templates/configmap.yaml @@ -0,0 +1,13 @@ +{{- if .Values.extraEnvs }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +data: +{{- range $key, $value := .Values.extraEnvs }} + {{ $key }}: |- + {{- $value | nindent 4 }} +{{- end }} +{{- end }} diff --git a/charts/nocodb/templates/deployment.yaml b/charts/nocodb/templates/deployment.yaml new file mode 100644 index 0000000000..582d365df8 --- /dev/null +++ b/charts/nocodb/templates/deployment.yaml @@ -0,0 +1,73 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "nocodb.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "nocodb.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "nocodb.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + volumeMounts: + - name: {{ include "nocodb.fullname" . }} + mountPath: /usr/app/data + envFrom: + - configMapRef: + name: {{ include "nocodb.fullname" . }} + - secretRef: + name: {{ include "nocodb.fullname" . }} + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + volumes: + - name: {{ include "nocodb.fullname" . }} + persistentVolumeClaim: + claimName: {{ include "nocodb.fullname" . }} diff --git a/charts/nocodb/templates/hpa.yaml b/charts/nocodb/templates/hpa.yaml new file mode 100644 index 0000000000..d09679632c --- /dev/null +++ b/charts/nocodb/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "nocodb.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/nocodb/templates/ingress.yaml b/charts/nocodb/templates/ingress.yaml new file mode 100644 index 0000000000..86dd9bc2f8 --- /dev/null +++ b/charts/nocodb/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "nocodb.fullname" . -}} +{{- $svcPort := .Values.ingress.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/nocodb/templates/pvc.yaml b/charts/nocodb/templates/pvc.yaml new file mode 100644 index 0000000000..67656c01d1 --- /dev/null +++ b/charts/nocodb/templates/pvc.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.selectorLabels" . | nindent 8 }} +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: {{ .Values.storage.size }} + storageClassName: {{ .Values.storage.storageClassName }} + volumeMode: Filesystem diff --git a/charts/nocodb/templates/secret.yaml b/charts/nocodb/templates/secret.yaml new file mode 100644 index 0000000000..85dd6743aa --- /dev/null +++ b/charts/nocodb/templates/secret.yaml @@ -0,0 +1,13 @@ +{{- if .Values.extraSecretEnvs }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +data: + NC_DB: {{ include "databaseUri" . | b64enc}} +{{- range $key, $value := .Values.extraSecretEnvs }} + {{ $key }}: '{{ $value | b64enc }}' +{{- end }} +{{- end }} diff --git a/charts/nocodb/templates/service.yaml b/charts/nocodb/templates/service.yaml new file mode 100644 index 0000000000..92d484d6bf --- /dev/null +++ b/charts/nocodb/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "nocodb.fullname" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "nocodb.selectorLabels" . | nindent 4 }} diff --git a/charts/nocodb/templates/serviceaccount.yaml b/charts/nocodb/templates/serviceaccount.yaml new file mode 100644 index 0000000000..e61ce26515 --- /dev/null +++ b/charts/nocodb/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "nocodb.serviceAccountName" . }} + labels: + {{- include "nocodb.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/nocodb/templates/tests/test-connection.yaml b/charts/nocodb/templates/tests/test-connection.yaml new file mode 100644 index 0000000000..528686c6e7 --- /dev/null +++ b/charts/nocodb/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "nocodb.fullname" . }}-test-connection" + labels: + {{- include "nocodb.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "nocodb.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/nocodb/values.yaml b/charts/nocodb/values.yaml new file mode 100644 index 0000000000..5d7bf7887e --- /dev/null +++ b/charts/nocodb/values.yaml @@ -0,0 +1,98 @@ +# Default values for nocodb. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nocodb/nocodb + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: false + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 8080 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: [] + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} + +extraEnvs: + NC_PUBLIC_URL: https:/nocodb.local.org + +extraSecretEnvs: + NC_AUTH_JWT_SECRET: secretString + +storage: + size: 3Gi + storageClassName: "" + +postgresql: + enabled: false + auth: + database: nocodb + username: nocodb + password: secretPass + persistence: + size: 8Gi From 836c1c4dacff5c6c17afae14f2c86f5ded7adabb Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:35:06 +0530 Subject: [PATCH 02/47] docs: enterprise license key --- .../content/en/setup-and-usages/account-settings.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/noco-docs/content/en/setup-and-usages/account-settings.md b/packages/noco-docs/content/en/setup-and-usages/account-settings.md index 8a33edb0db..3d28cbc476 100644 --- a/packages/noco-docs/content/en/setup-and-usages/account-settings.md +++ b/packages/noco-docs/content/en/setup-and-usages/account-settings.md @@ -45,4 +45,10 @@ Signup without an invitation is disabled by default and can be managed from UI b You can also manage the app store plugins here. -![image](https://user-images.githubusercontent.com/35857179/203267619-24a8f5f5-1c8c-4419-a7a1-be4377fe6216.png) \ No newline at end of file +![image](https://user-images.githubusercontent.com/35857179/203267619-24a8f5f5-1c8c-4419-a7a1-be4377fe6216.png) + +## License + +You can configure NocoDB Enterprise `License key` here + +![Screenshot 2023-01-12 at 2 30 57 PM](https://user-images.githubusercontent.com/86527202/212023989-0129af0a-689d-465e-bdda-3d54399ea6b7.png) From e878f81c43f503b365e98852c7b390dbd8bec52c Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 12 Jan 2023 18:05:37 +0800 Subject: [PATCH 03/47] chore: update sdk version --- packages/nc-gui/package-lock.json | 52 +++++++++++---------------- packages/nc-gui/package.json | 2 +- packages/nocodb-sdk/package-lock.json | 4 +-- packages/nocodb/package-lock.json | 30 +++++++++------- packages/nocodb/package.json | 4 +-- 5 files changed, 42 insertions(+), 50 deletions(-) diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json index 938eb57bfc..ef84a011f4 100644 --- a/packages/nc-gui/package-lock.json +++ b/packages/nc-gui/package-lock.json @@ -29,7 +29,7 @@ "jwt-decode": "^3.1.2", "locale-codes": "^1.3.1", "monaco-editor": "^0.33.0", - "nocodb-sdk": "0.101.0", + "nocodb-sdk": "file:../nocodb-sdk", "papaparse": "^5.3.2", "qrcode": "^1.5.1", "socket.io-client": "^4.5.1", @@ -96,7 +96,6 @@ }, "../nocodb-sdk": { "version": "0.101.0", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -8544,6 +8543,7 @@ "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "devOptional": true, "funding": [ { "type": "individual", @@ -11959,21 +11959,8 @@ } }, "node_modules/nocodb-sdk": { - "version": "0.101.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz", - "integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==", - "dependencies": { - "axios": "^0.21.1", - "jsep": "^1.3.6" - } - }, - "node_modules/nocodb-sdk/node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dependencies": { - "follow-redirects": "^1.14.0" - } + "resolved": "../nocodb-sdk", + "link": true }, "node_modules/node-abi": { "version": "3.23.0", @@ -23937,7 +23924,8 @@ "follow-redirects": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "devOptional": true }, "form-data": { "version": "4.0.0", @@ -26410,22 +26398,22 @@ } }, "nocodb-sdk": { - "version": "0.101.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz", - "integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==", + "version": "file:../nocodb-sdk", "requires": { + "@typescript-eslint/eslint-plugin": "^4.0.1", + "@typescript-eslint/parser": "^4.0.1", "axios": "^0.21.1", - "jsep": "^1.3.6" - }, - "dependencies": { - "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "requires": { - "follow-redirects": "^1.14.0" - } - } + "cspell": "^4.1.0", + "eslint": "^7.8.0", + "eslint-config-prettier": "^6.11.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-functional": "^3.0.2", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-prettier": "^4.0.0", + "jsep": "^1.3.6", + "npm-run-all": "^4.1.5", + "prettier": "^2.1.1", + "typescript": "^4.0.2" } }, "node-abi": { diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 4c52439c96..49a6c5a9a0 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -52,7 +52,7 @@ "jwt-decode": "^3.1.2", "locale-codes": "^1.3.1", "monaco-editor": "^0.33.0", - "nocodb-sdk": "0.101.0", + "nocodb-sdk": "file:../nocodb-sdk", "papaparse": "^5.3.2", "qrcode": "^1.5.1", "socket.io-client": "^4.5.1", diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json index 309760dc50..47be503215 100644 --- a/packages/nocodb-sdk/package-lock.json +++ b/packages/nocodb-sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb-sdk", - "version": "0.101.0-beta.0", + "version": "0.101.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb-sdk", - "version": "0.101.0-beta.0", + "version": "0.101.0", "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 6f4d012571..30cc3fe7ee 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -68,7 +68,7 @@ "nc-lib-gui": "0.101.0", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "0.101.0", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -154,7 +154,6 @@ }, "../nocodb-sdk": { "version": "0.101.0", - "extraneous": true, "license": "AGPL-3.0-or-later", "dependencies": { "axios": "^0.21.1", @@ -11223,13 +11222,8 @@ "dev": true }, "node_modules/nocodb-sdk": { - "version": "0.101.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz", - "integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==", - "dependencies": { - "axios": "^0.21.1", - "jsep": "^1.3.6" - } + "resolved": "../nocodb-sdk", + "link": true }, "node_modules/node-abort-controller": { "version": "3.0.1", @@ -27742,12 +27736,22 @@ "dev": true }, "nocodb-sdk": { - "version": "0.101.0", - "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz", - "integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==", + "version": "file:../nocodb-sdk", "requires": { + "@typescript-eslint/eslint-plugin": "^4.0.1", + "@typescript-eslint/parser": "^4.0.1", "axios": "^0.21.1", - "jsep": "^1.3.6" + "cspell": "^4.1.0", + "eslint": "^7.8.0", + "eslint-config-prettier": "^6.11.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-functional": "^3.0.2", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-prettier": "^4.0.0", + "jsep": "^1.3.6", + "npm-run-all": "^4.1.5", + "prettier": "^2.1.1", + "typescript": "^4.0.2" } }, "node-abort-controller": { diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 5500739529..1580154404 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -108,7 +108,7 @@ "nc-lib-gui": "0.101.0", "nc-plugin": "0.1.2", "ncp": "^2.0.0", - "nocodb-sdk": "0.101.0", + "nocodb-sdk": "file:../nocodb-sdk", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "os-locale": "^5.0.0", @@ -183,4 +183,4 @@ "prettier": { "singleQuote": true } -} \ No newline at end of file +} From 6c2b7ae449ece725e4731c2037d2eee1e858b6a2 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 12 Jan 2023 20:13:27 +0530 Subject: [PATCH 04/47] refactor: 'Link To Another Record' instead of 'Child Table' Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- packages/nc-gui/components/smartsheet/column/LookupOptions.vue | 2 +- packages/nc-gui/components/smartsheet/column/RollupOptions.vue | 2 +- packages/nc-gui/lang/en.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue index 0667cc7b9f..abd1ebaa0f 100644 --- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue @@ -56,7 +56,7 @@ const columns = $computed(() => {