diff --git a/app/[locale]/(admin)/admin/categories/components/table-categories.tsx b/app/[locale]/(admin)/admin/categories/components/table-categories.tsx index ffebfd4..0534a07 100644 --- a/app/[locale]/(admin)/admin/categories/components/table-categories.tsx +++ b/app/[locale]/(admin)/admin/categories/components/table-categories.tsx @@ -71,7 +71,7 @@ const TableCategories = () => { { accessorKey: "statusId", header: "Status", - cell: ({ row }) => (row.original.isPublish ? "Publish" : "Draft"), + cell: ({ row }) => (row.original.isActive ? "Active" : "Draft"), }, { id: "actions", diff --git a/app/[locale]/(admin)/admin/content/image/components/image-tabs.tsx b/app/[locale]/(admin)/admin/content/image/components/image-tabs.tsx index 1a48136..333d4fb 100644 --- a/app/[locale]/(admin)/admin/content/image/components/image-tabs.tsx +++ b/app/[locale]/(admin)/admin/content/image/components/image-tabs.tsx @@ -6,12 +6,12 @@ import TableImage from "./table-image"; import PendingApprovalTable from "./pending-approval-table"; const ImageTabs = () => { - const [activeTab, setActiveTab] = React.useState("pending"); + const [activeTab, setActiveTab] = React.useState("submitted"); return (
-
+ {/*
{
- + */}
- + {/*
-
+
*/}
); diff --git a/app/[locale]/(admin)/admin/content/image/components/table-image.tsx b/app/[locale]/(admin)/admin/content/image/components/table-image.tsx index c81bde2..b543903 100644 --- a/app/[locale]/(admin)/admin/content/image/components/table-image.tsx +++ b/app/[locale]/(admin)/admin/content/image/components/table-image.tsx @@ -290,9 +290,9 @@ const TableImage = () => { return (
-
- - + + { return (
-
+
diff --git a/app/[locale]/(admin)/admin/content/video/components/audio-visual-tabs.tsx b/app/[locale]/(admin)/admin/content/video/components/audio-visual-tabs.tsx index fe8b8a1..77d5669 100644 --- a/app/[locale]/(admin)/admin/content/video/components/audio-visual-tabs.tsx +++ b/app/[locale]/(admin)/admin/content/video/components/audio-visual-tabs.tsx @@ -11,7 +11,7 @@ const AudioVisualTabs = () => { return (
-
+ {/*
{
-
+
*/}
@@ -40,11 +40,11 @@ const AudioVisualTabs = () => {
- + {/*
-
+
*/}
); diff --git a/app/[locale]/(admin)/admin/dashboard/page.tsx b/app/[locale]/(admin)/admin/dashboard/page.tsx index 938905c..123409e 100644 --- a/app/[locale]/(admin)/admin/dashboard/page.tsx +++ b/app/[locale]/(admin)/admin/dashboard/page.tsx @@ -21,7 +21,7 @@ export default function AdminPage() { return (
-
+ {/*
-
+
*/}
@@ -266,7 +266,8 @@ function TenantSettingsContentTable() { )}
- {isEditingWorkflow && workflow && workflow.workflow?.id ? ( + {/* {isEditingWorkflow && workflow && workflow.workflow?.id ? ( */} + {isEditingWorkflow ? ( @@ -281,8 +282,8 @@ function TenantSettingsContentTable() {
-
+
{workflow.workflow.totalSteps}
Total Steps
-
+
{workflow.workflow.activeSteps}
Active Steps
-
+
{ // workflow.workflow.requiresApproval - workflow.clientSettings.requiresApproval - ? "Yes" - : "No" + workflow.clientSettings.requiresApproval ? "Yes" : "No" }
@@ -397,7 +396,7 @@ function TenantSettingsContentTable() {
-
+
(
{step.stepOrder}
-
{step.stepName}
+
{step.stepName}
{step.conditionType && `Condition: ${step.conditionType}`} @@ -480,7 +479,7 @@ function TenantSettingsContentTable() {

Client Settings

-
+
Default Workflow
@@ -488,7 +487,7 @@ function TenantSettingsContentTable() { {workflow.clientSettings.defaultWorkflowName}
-
+
Auto Publish Articles
@@ -504,7 +503,7 @@ function TenantSettingsContentTable() { : "No"}
-
+
Requires Approval
@@ -520,7 +519,7 @@ function TenantSettingsContentTable() { : "No"}
-
+
Settings Active
@@ -543,7 +542,7 @@ function TenantSettingsContentTable() { Workflow Statistics
-
+
Total Articles Processed
@@ -551,7 +550,7 @@ function TenantSettingsContentTable() { {workflow.statistics.totalArticlesProcessed}
-
+
Pending Articles
@@ -559,7 +558,7 @@ function TenantSettingsContentTable() { {workflow.statistics.pendingArticles}
-
+
Approved Articles
@@ -567,7 +566,7 @@ function TenantSettingsContentTable() { {workflow.statistics.approvedArticles}
-
+
Rejected Articles
@@ -575,7 +574,7 @@ function TenantSettingsContentTable() { {workflow.statistics.rejectedArticles}
-
+
Average Processing Time
@@ -583,7 +582,7 @@ function TenantSettingsContentTable() { {workflow.statistics.averageProcessingTime}h
-
+
Most Active Step
@@ -600,7 +599,7 @@ function TenantSettingsContentTable() { Workflow Information
-
+
Client ID
@@ -608,7 +607,7 @@ function TenantSettingsContentTable() { {workflow.workflow.clientId}
-
+
Created At
@@ -616,7 +615,7 @@ function TenantSettingsContentTable() { {new Date(workflow.workflow.createdAt).toLocaleString()}
-
+
Updated At
@@ -624,7 +623,7 @@ function TenantSettingsContentTable() { {new Date(workflow.workflow.updatedAt).toLocaleString()}
-
+
Workflow ID
@@ -632,7 +631,7 @@ function TenantSettingsContentTable() { {workflow.workflow.id}
-
+
Has Branches
@@ -646,7 +645,7 @@ function TenantSettingsContentTable() { {workflow.workflow.hasBranches ? "Yes" : "No"}
-
+
Max Step Order
@@ -751,7 +750,7 @@ function TenantSettingsContentTable() { onOpenChange={setIsHierarchyExpanded} > - +
@@ -769,7 +768,7 @@ function TenantSettingsContentTable() {
{userLevels - .filter((ul) => !ul.parentLevelId) // Root levels + .filter((ul) => !ul.parentLevelId) .sort((a, b) => a.levelNumber - b.levelNumber) .map((rootLevel) => (
@@ -779,7 +778,7 @@ function TenantSettingsContentTable() { {rootLevel.levelNumber}
-
+
{rootLevel.name}
@@ -814,7 +813,7 @@ function TenantSettingsContentTable() { {childLevel.levelNumber}
-
+
{childLevel.name}
@@ -846,7 +845,7 @@ function TenantSettingsContentTable() { )} - + {table.getHeaderGroups().map((headerGroup) => ( {headerGroup.headers.map((header) => ( diff --git a/components/form/UserLevelsForm.tsx b/components/form/UserLevelsForm.tsx index 4b23680..92d1bc6 100644 --- a/components/form/UserLevelsForm.tsx +++ b/components/form/UserLevelsForm.tsx @@ -1223,7 +1223,7 @@ export const UserLevelsForm: React.FC = ({ {menus.map((menu) => (