github/sim
1
1
Fork 0
mirror of https://github.com/simstudioai/sim.git synced 2026-04-06 03:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(notes): fix notes block spacing, additional logs for billing transfer route (#2029)

Browse Source
This commit is contained in:
Waleed
2025-11-17 13:37:17 -08:00
committed by GitHub
parent bfa7c919d8
commit 6f3dee867c
3 changed files with 60 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block.tsx
View File

@@ -35,51 +35,64 @@ const NoteMarkdown = memo(function NoteMarkdown({ content }: { content: string }
<ReactMarkdown
remarkPlugins={[remarkGfm]}
components={{
p: ({ children }) => (
<p className='!mt-0 !-mb-4 text-[#E5E5E5] text-sm leading-tight'>{children}</p>
p: ({ children }: any) => (
<p className='mb-2 break-words text-[#E5E5E5] text-sm'>{children}</p>
),
h1: ({ children }) => (
<h1 className='!mt-0 !-mb-4 font-semibold text-[#E5E5E5] text-lg leading-tight'>
h1: ({ children }: any) => (
<h1 className='mt-3 mb-1 break-words font-semibold text-[#E5E5E5] text-lg first:mt-0'>
{children}
</h1>
),
h2: ({ children }) => (
<h2 className='!mt-0 !-mb-4 font-semibold text-[#E5E5E5] text-base leading-tight'>
h2: ({ children }: any) => (
<h2 className='mt-3 mb-1 break-words font-semibold text-[#E5E5E5] text-base first:mt-0'>
{children}
</h2>
),
h3: ({ children }) => (
<h3 className='!mt-0 !-mb-4 font-semibold text-[#E5E5E5] text-sm leading-tight'>
h3: ({ children }: any) => (
<h3 className='mt-3 mb-1 break-words font-semibold text-[#E5E5E5] text-sm first:mt-0'>
{children}
</h3>
),
h4: ({ children }) => (
<h4 className='!mt-0 !-mb-4 font-semibold text-[#E5E5E5] text-xs leading-tight'>
h4: ({ children }: any) => (
<h4 className='mt-3 mb-1 break-words font-semibold text-[#E5E5E5] text-xs first:mt-0'>
{children}
</h4>
),
ul: ({ children }) => (
<ul className='!-mt-4 !-mb-4 [&_li>ul]:!mt-0 [&_li>ul]:!mb-0 [&_li>ol]:!mt-0 [&_li>ol]:!mb-0 list-disc pl-4 text-[#E5E5E5] text-sm leading-tight'>
ul: ({ children }: any) => (
<ul className='mt-1 mb-2 list-disc break-words pl-4 text-[#E5E5E5] text-sm'>
{children}
</ul>
),
ol: ({ children }) => (
<ol className='!-mt-4 !-mb-4 [&_li>ul]:!mt-0 [&_li>ul]:!mb-0 [&_li>ol]:!mt-0 [&_li>ol]:!mb-0 list-decimal pl-4 text-[#E5E5E5] text-sm leading-tight'>
ol: ({ children }: any) => (
<ol className='mt-1 mb-2 list-decimal break-words pl-4 text-[#E5E5E5] text-sm'>
{children}
</ol>
),
li: ({ children }) => <li className='!mb-0 leading-tight'>{children}</li>,
code: ({ inline, children }: any) =>
inline ? (
<code className='break-words rounded bg-[var(--divider)] px-1 py-0.5 text-[#F59E0B] text-xs'>
li: ({ children }: any) => <li className='mb-0 break-words'>{children}</li>,
code: ({ inline, className, children, ...props }: any) => {
const isInline = inline || !className?.includes('language-')
if (isInline) {
return (
<code
{...props}
className='whitespace-normal rounded bg-gray-200 px-1 py-0.5 font-mono text-[#F59E0B] text-xs dark:bg-[var(--surface-11)] dark:text-[#F59E0B]'
>
{children}
</code>
)
}
return (
<code
{...props}
className='block whitespace-pre-wrap break-words rounded bg-[#1A1A1A] p-2 text-[#E5E5E5] text-xs'
>
{children}
</code>
) : (
<code className='block whitespace-pre-wrap break-words rounded bg-[#1A1A1A] p-2 text-[#E5E5E5] text-xs'>
{children}
</code>
),
a: ({ href, children }) => (
)
},
a: ({ href, children }: any) => (
<a
href={href}
target='_blank'
@@ -89,10 +102,12 @@ const NoteMarkdown = memo(function NoteMarkdown({ content }: { content: string }
{children}
</a>
),
strong: ({ children }) => <strong className='font-semibold text-white'>{children}</strong>,
em: ({ children }) => <em className='text-[#B8B8B8]'>{children}</em>,
blockquote: ({ children }) => (
<blockquote className='!mt-0 !-mb-4 border-[#F59E0B] border-l-2 pl-3 text-[#B8B8B8] italic'>
strong: ({ children }: any) => (
<strong className='break-words font-semibold text-white'>{children}</strong>
),
em: ({ children }: any) => <em className='break-words text-[#B8B8B8]'>{children}</em>,
blockquote: ({ children }: any) => (
<blockquote className='mt-1 mb-2 break-words border-[#F59E0B] border-l-2 pl-3 text-[#B8B8B8] italic'>
{children}
</blockquote>
),
@@ -195,7 +210,7 @@ export const NoteBlock = memo(function NoteBlock({ id, data }: NodeProps<NoteBlo
</div>
<div className='relative px-[12px] pt-[6px] pb-[8px]'>
<div className='relative whitespace-pre-wrap break-words'>
<div className='relative break-words'>
{isEmpty ? (
<p className='text-[#868686] text-sm italic'>Add a note...</p>
) : showMarkdown ? (

17
apps/sim/lib/subscription/upgrade.ts
View File

@@ -76,7 +76,7 @@ export function useSubscriptionUpgrade() {
try {
await client.organization.setActive({ organizationId: result.organizationId })
logger.info('Set organization as active and updated referenceId', {
logger.info('Set organization as active', {
organizationId: result.organizationId,
oldReferenceId: userId,
newReferenceId: referenceId,
@@ -90,6 +90,11 @@ export function useSubscriptionUpgrade() {
}
if (currentSubscriptionId) {
logger.info('Transferring personal subscription to organization', {
subscriptionId: currentSubscriptionId,
organizationId: referenceId,
})
const transferResponse = await fetch(
`/api/users/me/subscription/${currentSubscriptionId}/transfer`,
{
@@ -101,8 +106,18 @@ export function useSubscriptionUpgrade() {
if (!transferResponse.ok) {
const text = await transferResponse.text()
logger.error('Failed to transfer subscription to organization', {
subscriptionId: currentSubscriptionId,
organizationId: referenceId,
error: text,
})
throw new Error(text || 'Failed to transfer subscription to organization')
}
logger.info('Successfully transferred subscription to organization', {
subscriptionId: currentSubscriptionId,
organizationId: referenceId,
})
}
} catch (error) {
logger.error('Failed to create organization for team plan', error)

67
helm/sim/templates/NOTES.txt
View File

@@ -1,67 +0,0 @@
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
http{{ if .Values.ingress.tls.enabled }}s{{ end }}://{{ .Values.ingress.app.host }}
{{- else if contains "NodePort" .Values.app.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "sim.fullname" . }}-app)
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.app.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 "sim.fullname" . }}-app'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "sim.fullname" . }}-app --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.app.service.port }}
{{- else if contains "ClusterIP" .Values.app.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "{{ include "sim.app.selectorLabels" . }}" -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 }}
{{- if .Values.realtime.enabled }}
2. Realtime service is available at:
{{- if .Values.ingress.enabled }}
http{{ if .Values.ingress.tls.enabled }}s{{ end }}://{{ .Values.ingress.realtime.host }}
{{- else }}
Use port-forwarding: kubectl port-forward svc/{{ include "sim.fullname" . }}-realtime 3002:3002
{{- end }}
{{- end }}
{{- if .Values.postgresql.enabled }}
3. PostgreSQL database is running internally and accessible to the application.
Database: {{ .Values.postgresql.auth.database }}
Username: {{ .Values.postgresql.auth.username }}
{{- end }}
{{- if .Values.ollama.enabled }}
4. Ollama service is available internally for AI model operations.
{{- end }}
{{- if not .Values.postgresql.enabled }}
WARNING: You have disabled the internal PostgreSQL database.
Make sure to configure an external database connection in your values.yaml file.
{{- end }}
{{- if not .Values.app.env.BETTER_AUTH_SECRET }}
⚠️ SECURITY WARNING: Required secrets are not configured!
Please set the following REQUIRED values for production use:
helm upgrade {{ .Release.Name }} ./helm/sim \
--set app.env.BETTER_AUTH_SECRET="your-secure-32-char-secret-here" \
--set app.env.ENCRYPTION_KEY="your-secure-32-char-encryption-key" \
--set realtime.env.BETTER_AUTH_SECRET="your-secure-32-char-secret-here" \
--set postgresql.auth.password="your-secure-database-password"
Generate secure secrets using:
openssl rand -hex 32
{{- end }}
For more information and configuration options, see:
- Chart documentation: https://github.com/simstudioai/sim/tree/main/helm/sim
- Sim documentation: https://docs.sim.ai