Skip to content

Commit b1995e0

Browse files
dixitdeepakdixitdeepak
committed
Worked on following:
- Corrected relationship for shopify app status fields - Added option to update the app secrete, and status form shopify app view - Added status item and status flow transition data
1 parent 8c1617d commit b1995e0

File tree

3 files changed

+32
-11
lines changed

3 files changed

+32
-11
lines changed

‎entity/ShopifyEntities.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ under the License.
6262
<field name="publishedDate" type="date-time"/>
6363
<relationship type="one-nofk" title="AppType" related="moqui.basic.Enumeration" short-alias="appTypeEnum">
6464
<key-map field-name="appTypeId" related="enumId"/></relationship>
65-
<relationship type="one-nofk" title="AppType" related="moqui.basic.Enumeration" short-alias="status">
66-
<key-map field-name="statusId" related="enumId"/></relationship>
65+
<relationship type="one-nofk" related="moqui.basic.StatusItem" short-alias="status">
66+
<key-map field-name="statusId"/></relationship>
6767
<relationship type="many" related="co.hotwax.shopify.app.ShopifyShopApp" short-alias="shops">
6868
<key-map field-name="appId"/>
6969
</relationship>
@@ -72,10 +72,16 @@ under the License.
7272
<moqui.basic.Enumeration enumId="SHOP_APP_CUSTOM" enumTypeId="SHOPIFY_APP_TYPE" description="Custom"/>
7373
<moqui.basic.Enumeration enumId="SHOP_APP_PUBLIC" enumTypeId="SHOPIFY_APP_TYPE" description="Public"/>
7474

75-
<moqui.basic.EnumerationType enumTypeId="SHOPIFY_APP_STATUS" description="Shopify App Status" hasTable="N"/>
76-
<moqui.basic.Enumeration enumId="SHOPIFY_APP_DRAFT" description="Draft" sequenceNum="01" enumCode="DRAFT" enumTypeId="SHOPIFY_APP_STATUS"/>
77-
<moqui.basic.Enumeration enumId="SHOPIFY_APP_ACTIVE" description="Active" sequenceNum="02" enumCode="ACTIVE" enumTypeId="SHOPIFY_APP_STATUS"/>
78-
<moqui.basic.Enumeration enumId="SHOPIFY_APP_ARCHIVED" description="Archived" sequenceNum="02" enumCode="ARCHIVED" enumTypeId="SHOPIFY_APP_STATUS"/>
75+
<moqui.basic.StatusType statusTypeId="SHOPIFY_APP_STATUS" description="Shopify App Status"/>
76+
<moqui.basic.StatusItem statusId="SHOPIFY_APP_DRAFT" statusTypeId="SHOPIFY_APP_STATUS" sequenceNum="01" statusCode="DRAFT" description="Draft"/>
77+
<moqui.basic.StatusItem statusId="SHOPIFY_APP_ACTIVE" statusTypeId="SHOPIFY_APP_STATUS" sequenceNum="02" statusCode="ACTIVE" description="Active"/>
78+
<moqui.basic.StatusItem statusId="SHOPIFY_APP_ARCHIVED" statusTypeId="SHOPIFY_APP_STATUS" sequenceNum="03" statusCode="ARCHIVED" description="Archived"/>
79+
80+
<moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="SHOPIFY_APP_DRAFT" toStatusId="SHOPIFY_APP_ACTIVE" transitionName="Active"/>
81+
<moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="SHOPIFY_APP_DRAFT" toStatusId="SHOPIFY_APP_ARCHIVED" transitionName="Archived"/>
82+
<moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="SHOPIFY_APP_ACTIVE" toStatusId="SHOPIFY_APP_ARCHIVED" transitionName="Archived"/>
83+
<moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="SHOPIFY_APP_ARCHIVED" toStatusId="SHOPIFY_APP_DRAFT" transitionName="Draft"/>
84+
<moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="SHOPIFY_APP_ARCHIVED" toStatusId="SHOPIFY_APP_ACTIVE" transitionName="Active"/>
7985
</seed-data>
8086
</entity>
8187

‎screen/ShopifyScreens/ShopifyApp/FindShopifyApp.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<field name="statusId">
3636
<default-field>
3737
<drop-down>
38-
<entity-options key="${enumId}">
39-
<entity-find entity-name="moqui.basic.Enumeration" cache="true">
40-
<econdition field-name="enumTypeId" value="SHOPIFY_APP_STATUS"/>
38+
<entity-options key="${statusId}">
39+
<entity-find entity-name="moqui.basic.StatusItem" cache="true">
40+
<econdition field-name="statusTypeId" value="SHOPIFY_APP_STATUS"/>
4141
</entity-find>
4242
</entity-options>
4343
</drop-down>

‎screen/ShopifyScreens/ShopifyApp/ShopifyAppDetail.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,23 @@
3838
<container-row><row-col md="6">
3939
<container-box><box-header title="Shopify App #${appId}"/>
4040
<box-body>
41-
<form-single name="ShopifyApp" dynamic="true" map="shopifyApp">
41+
<form-single name="ShopifyApp" dynamic="true" map="shopifyApp" transition="updateShopifyApp">
4242
<auto-fields-entity entity-name="co.hotwax.shopify.app.ShopifyApp"/>
43+
<field name="appName"><default-field><text-line/></default-field></field>
44+
<field name="appTypeId">
45+
<default-field><display-entity entity-name="moqui.basic.Enumeration" key-field-name="enumId"/></default-field>
46+
</field>
47+
<field name="statusId">
48+
<default-field><drop-down>
49+
<entity-options >
50+
<entity-find entity-name="moqui.basic.StatusItem" cache="true">
51+
<econdition field-name="statusTypeId" value="SHOPIFY_APP_STATUS"/>
52+
</entity-find>
53+
</entity-options>
54+
</drop-down></default-field>
55+
</field>
56+
<field name="clientSecret"><default-field ><text-line/></default-field></field>
57+
<field name="submitButton"><default-field title="Update"><submit confirmation="Are you sure want to update the shopify app?"/></default-field></field>
4358
</form-single>
4459
</box-body>
4560
</container-box>
@@ -111,7 +126,7 @@
111126
</drop-down>
112127
</default-field></field>
113128
<field name="hotwaxAccessToken"><default-field title="Hotwax access token"><text-line/></default-field></field>
114-
<field name="submitButton"><default-field title="Update"><submit/></default-field></field>
129+
<field name="submitButton"><default-field title="Update"><submit confirmation="Are you sure want to update the data?"/></default-field></field>
115130
<field name="deleteLink"><default-field title="">
116131
<link url="expireShopifyShopApp" text="X" parameter-map="[appId:appId, shopId:shopId, fromDate:fromDate, thruDate:ec.user.nowTimestamp]"
117132
confirmation="Are you sure want to delete app for shop ${shopName?:shopId}?"/>

0 commit comments

Comments
 (0)